Update README.md

README typo fix.

.gitignore

@@ -14,6 +14,7 @@ project/plugins/project/
 .classpath
 .project
 .cache
+.settings
 
 # IntelliJ specific
 .idea/

README.md

@@ -23,7 +23,7 @@ Following features are not implemented, but we will make them in the future rele
 - File editing in repository viewer
 - Comment for the changeset
 - Network graph
-- Statics
+- Statistics
 - Watch / Star
 
 If you want to try the development version of GitBucket, see the documentation for developers at [Wiki](https://github.com/takezoe/gitbucket/wiki).
@@ -35,23 +35,81 @@ Installation
 2. Deploy it to the Servlet 3.0 container such as Tomcat 7.x, Jetty 8.x, GlassFish 3.x or higher.
 3. Access **http://[hostname]:[port]/gitbucket/** using your web browser.
 
+If you are using Gitbucket behind a webserver please make sure you have increased the **client_max_body_size** (on nignx)
+
 The default administrator account is **root** and password is **root**.
 
-or you can start GitBucket by ```java -jar gitbucket.war``` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.
+or you can start GitBucket by `java -jar gitbucket.war` without servlet container. In this case, GitBucket URL is **http://[hostname]:8080/**. You can specify following options.
 
 - --port=[NUMBER]
 - --prefix=[CONTEXTPATH]
+- --host=[HOSTNAME]
+- --gitbucket.home=[DATA_DIR]
 
-To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.
+To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored in HOME/.gitbucket. So if you want to back up GitBucket data, copy this directory to the other disk.
 
 For Installation on Windows Server with IIS see [this wiki page](https://github.com/takezoe/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)
 
+### Mac OS X
+On OS X, copy the [gitbucket.plist](https://raw.github.com/takezoe/gitbucket/master/contrib/macosx/gitbucket.plist) file to `~/Library/LaunchAgents/`
+
+Run the following commands in `Terminal` to
+
+- start gitbucket: `launchctl load ~/Library/LaunchAgents/gitbucket.plist`
+- stop gitbucket: `launchctl unload ~/Library/LaunchAgents/gitbucket.plist`
+
 Release Notes
 --------
+### 1.12 - 29 Mar 2014
+- SSH repository access is available
+- Allow users can create and management their groups
+- Git submodule support
+- Close issues via commit messages
+- Show repository description below the name on repository page
+- Fix presentation of the source viewer
+- Upgrade to sbt 0.13
+- Fix some bugs
+
+### 1.11.1 - 06 Mar 2014
+- Bug fix
+
+### 1.11 - 01 Mar 2014
+- Base URL for redirection, notification and repository URL box is configurable
+- Remove ```--https``` option because it's possible to substitute in the base url
+- Headline anchor is available for Markdown contents such as Wiki page
+- Improve H2 connectivity
+- Label is available for pull requests not only issues
+- Delete branch button is added
+- Repository icons are updated
+- Select lines of source code by URL hash like `#L10` or `#L10-L15` in repository viewer
+- Display reference to issue from others in comment list
+- Fix some bugs
+
+### 1.10 - 01 Feb 2014
+- Rename repository
+- Transfer repository owner
+- Change default data directory to `HOME/.gitbucket` from `HOME/gitbucket` to avoid problem like #243, but if data directory already exist at HOME/gitbucket, it continues being used.
+- Add LDAP display name attribute
+- Response performance improvement
+- Fix some bugs
+
+### 1.9 - 28 Dec 2013
+- Display GITBUCKET_HOME on the system settings page
+- Fix some bugs
+
+### 1.8 - 30 Nov 2013
+- Add user and group deletion
+- Improve pull request performance
+- Pull request synchronization (when source repository is updated after pull request, it's applied to the pull request)
+- LDAP StartTLS support
+- Enable hard wrapping in Markdown
+- Add new some options to specify the data directory. See details in [Wiki](https://github.com/takezoe/gitbucket/wiki/DirectoryStructure).
+- Fix some bugs
+
 ### 1.7 - 26 Oct 2013
 - Support working on Java6 in embedded Jetty mode
-- Add ```--host``` option to bind specified host name in embedded Jetty mode
-- Add ```--https=true``` option to use https in embedded Jetty mode
+- Add `--host` option to bind specified host name in embedded Jetty mode
+- Add `--https=true` option to force https scheme when using embedded Jetty mode at the back of https proxy
 - Add full name as user property
 - Change link color for absent Wiki pages
 - Add ZIP download button to the repository viewer tab

contrib/macosx/gitbucket.plist

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>Label</key>
+    <string>gitbucket</string>
+    <key>ProgramArguments</key>
+    <array>
+      <string>/usr/bin/java</string>
+      <string>-Dmail.smtp.starttls.enable=true</string>
+      <string>-jar</string>
+      <string>gitbucket.war</string>
+      <string>--host=127.0.0.1</string>
+      <string>--port=8080</string>
+      <string>--https=true</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+  </dict>
+</plist>

contrib/redhat/gitbucket.conf

@@ -4,9 +4,6 @@
 # Server port
 #GITBUCKET_PORT=8080
 
-# Force HTTPS scheme
-#GITBUCKET_HTTPS=false
-
 # Data directory (GITBUCKET_HOME/gitbucket)
 #GITBUCKET_HOME=/var/lib/gitbucket
 

contrib/redhat/gitbucket.init

@@ -39,9 +39,6 @@ start() {
 	if [ $GITBUCKET_HOST ]; then
 		START_OPTS="${START_OPTS} --host=${GITBUCKET_HOST}"
 	fi
-	if [ $GITBUCKET_HTTPS ]; then
-		START_OPTS="${START_OPTS} --https=true"
-	fi
 
 	# Run the Java process
 	GITBUCKET_HOME="${GITBUCKET_HOME}" java $GITBUCKET_JVM_OPTS -jar $GITBUCKET_WAR_FILE $START_OPTS >>$LOG_FILE 2>&1 &

contrib/redhat/gitbucket.spec

@@ -1,6 +1,6 @@
 Name:		gitbucket
-Summary:	Github clone written with Scala.
-Version:	1.6
+Summary:	GitHub clone written with Scala.
+Version:	1.7
 Release:	1%{?dist}
 License:	Apache
 URL:		https://github.com/takezoe/gitbucket
@@ -15,7 +15,7 @@ Requires:	java >= 1.7
 
 %description
 
-GitBucket is the easily installable Github clone written with Scala.
+GitBucket is the easily installable GitHub clone written with Scala.
 
 
 %install
@@ -40,5 +40,8 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/run.log
 
 
 %changelog
+* Mon Oct 28 2013 Jiri Tyr <jiri_DOT_tyr at gmail.com>
+- Version bump to v1.7.
+
 * Thu Oct 17 2013 Jiri Tyr <jiri_DOT_tyr at gmail.com>
 - First build.

etc/icons.svg

@@ -25,17 +25,17 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.4"
-     inkscape:cx="629.30023"
-     inkscape:cy="281.44758"
+     inkscape:cx="450.21999"
+     inkscape:cy="97.51519"
      inkscape:document-units="px"
      inkscape:current-layer="layer1-9"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="705"
-     inkscape:window-x="-8"
+     inkscape:window-height="706"
+     inkscape:window-x="1912"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="true"
+     inkscape:snap-global="false"
      inkscape:snap-grids="false"
      inkscape:snap-page="false"
      inkscape:snap-bbox="true"
@@ -746,6 +746,238 @@
          d="m 937.41093,1044.4944 0,30.6797 -28.50183,0 0,41.2377 28.50183,0 0,27.1288 41.19033,0 0,-27.1288 29.35404,0 0,-41.2377 -29.35404,0 0,-30.6797 -41.19033,0 z"
          id="rect2995-0-2-7-7"
          inkscape:connector-curvature="0" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:9.34194565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083"
+         width="170.93134"
+         height="207.72536"
+         x="38.526306"
+         y="1299.8645" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:8.41239071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083-7"
+         width="171.86089"
+         height="167.53221"
+         x="38.061527"
+         y="1300.4821" />
+      <rect
+         id="rect2995-0-4"
+         y="1301.3412"
+         x="42.553577"
+         height="163.64935"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0"
+         y="1321.9025"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0-9"
+         y="1356.7848"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0-9-4"
+         y="1391.6671"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-0-9-4-8"
+         y="1426.5494"
+         x="85.732407"
+         height="17.555511"
+         width="16.782965"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-8"
+         y="1482.7141"
+         x="70.149086"
+         height="30.541632"
+         width="42.755199"
+         style="fill:#b3b3b3;stroke:none" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(1.0346242,0,0,1.5150471,-165.95814,-2.7851671)"
+         inkscape:transform-center-x="-2.5637799" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002-2"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(-0.93510984,0,0,1.5150471,326.24502,-2.7851671)"
+         inkscape:transform-center-x="3.5106467" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:9.34194565;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083-4"
+         width="170.93134"
+         height="207.72536"
+         x="280.50113"
+         y="1299.152" />
+      <rect
+         style="color:#000000;fill:none;stroke:#b3b3b3;stroke-width:8.41239071;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect3083-7-5"
+         width="171.86087"
+         height="167.53221"
+         x="280.03638"
+         y="1299.7695" />
+      <rect
+         id="rect2995-0-4-5"
+         y="1300.6287"
+         x="284.52841"
+         height="163.64934"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-8-5"
+         y="1482.0016"
+         x="312.12393"
+         height="30.541632"
+         width="42.755199"
+         style="fill:#b3b3b3;stroke:none" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002-27"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(1.0346242,0,0,1.5150471,76.016678,-3.496726)"
+         inkscape:transform-center-x="-3.8842459"
+         inkscape:transform-center-y="-1.5464308e-005" />
+      <path
+         sodipodi:type="star"
+         style="color:#000000;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-width:7.55999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4002-2-6"
+         sodipodi:sides="3"
+         sodipodi:cx="235.71429"
+         sodipodi:cy="1000.2193"
+         sodipodi:r1="15.016997"
+         sodipodi:r2="7.5084987"
+         sodipodi:arg1="0"
+         sodipodi:arg2="1.0471976"
+         inkscape:flatsided="false"
+         inkscape:rounded="0"
+         inkscape:randomized="0"
+         d="m 250.73129,1000.2193 -11.26275,6.5026 -11.26274,6.5025 0,-13.0051 0,-13.0051 11.26274,6.50255 z"
+         transform="matrix(-0.93510984,0,0,1.5150471,568.21986,-3.496726)"
+         inkscape:transform-center-x="5.318797"
+         inkscape:transform-center-y="-1.5464308e-005" />
+      <rect
+         id="rect2995-0-4-5-7"
+         y="1392.2405"
+         x="365.67133"
+         height="58.049755"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-7-6"
+         y="1319.5453"
+         x="326.67615"
+         height="49.632401"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-7-8"
+         y="1179.0293"
+         x="-767.54126"
+         height="58.049755"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none"
+         transform="matrix(0.68860063,-0.7251408,0.7251408,0.68860063,0,0)" />
+      <rect
+         id="rect2995-0-4-5-7-6-9"
+         y="1319.5453"
+         x="403.28595"
+         height="49.632404"
+         width="29.769083"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-7-8-2"
+         y="623.14606"
+         x="-1287.8975"
+         height="55.681484"
+         width="28.564859"
+         style="fill:#b3b3b3;stroke:none"
+         transform="matrix(-0.68607628,-0.72752961,-0.72274236,0.69111755,0,0)" />
+      <rect
+         style="color:#000000;fill:#ffffff;stroke:#b3b3b3;stroke-width:7.29121827999999980;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
+         id="rect3083-7-5-7"
+         width="172.98204"
+         height="125.03616"
+         x="529.78156"
+         y="1383.6165" />
+      <rect
+         id="rect2995-0-4-5-9"
+         y="1385.3533"
+         x="663.37042"
+         height="123.85819"
+         width="38.18644"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-9-5"
+         y="1401.4539"
+         x="552.03174"
+         height="15.96297"
+         width="117.00352"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-9-5-4"
+         y="1437.4023"
+         x="551.16083"
+         height="15.96297"
+         width="117.00352"
+         style="fill:#b3b3b3;stroke:none" />
+      <rect
+         id="rect2995-0-4-5-9-5-4-3"
+         y="1473.7642"
+         x="551.16083"
+         height="15.96297"
+         width="117.00352"
+         style="fill:#b3b3b3;stroke:none" />
+      <path
+         style="fill:none;stroke:#b3b3b3;stroke-width:23.0681076;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 558.62308,1380.7989 0,-45.237 c 0,0 13.52904,-35.6384 56.38304,-36.1894 40.81922,-0.5248 55.47363,34.6931 55.47363,34.6931 l 0.17276,48.4719"
+         id="path4310"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccscc" />
     </g>
   </g>
 </svg>

project/build.properties

@@ -1 +1 @@
-sbt.version=0.12.3
+sbt.version=0.13.1

project/build.scala

@@ -1,8 +1,6 @@
 import sbt._
 import Keys._
 import org.scalatra.sbt._
-import org.scalatra.sbt.PluginKeys._
-import sbt.ScalaVersion
 import twirl.sbt.TwirlPlugin._
 import com.typesafe.sbteclipse.plugin.EclipsePlugin.EclipseKeys
 
@@ -25,25 +23,26 @@ object MyBuild extends Build {
         Classpaths.typesafeReleases,
         "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
       ),
-      scalacOptions := Seq("-deprecation"),
+      scalacOptions := Seq("-deprecation", "-language:postfixOps"),
       libraryDependencies ++= Seq(
         "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.0.0.201306101825-r",
         "org.scalatra" %% "scalatra" % ScalatraVersion,
         "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
         "org.scalatra" %% "scalatra-json" % ScalatraVersion,
         "org.json4s" %% "json4s-jackson" % "3.2.5",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.0.2",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.0.14",
         "commons-io" % "commons-io" % "2.4",
         "org.pegdown" % "pegdown" % "1.4.1",
         "org.apache.commons" % "commons-compress" % "1.5",
         "org.apache.commons" % "commons-email" % "1.3.1",
         "org.apache.httpcomponents" % "httpclient" % "4.3",
+        "org.apache.sshd" % "apache-sshd" % "0.10.0",
         "com.typesafe.slick" %% "slick" % "1.0.1",
         "com.novell.ldap" % "jldap" % "2009-10-07",
         "com.h2database" % "h2" % "1.3.173",
         "ch.qos.logback" % "logback-classic" % "1.0.13" % "runtime",
         "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container;provided",
-        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar")),
+        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts Artifact("javax.servlet", "jar", "jar"),
         "junit" % "junit" % "4.11" % "test"
       ),
       EclipseKeys.withSource := true,

project/plugins.sbt

@@ -1,9 +1,11 @@
-addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.2.0")
+addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.4.0")
 
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
 
-addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.0")
+addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.5")
 
-addSbtPlugin("io.spray" % "sbt-twirl" % "0.6.1")
+resolvers += "spray repo" at "http://repo.spray.io"
 
-addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.2")
+addSbtPlugin("io.spray" % "sbt-twirl" % "0.7.0")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.4")

sbt.bat

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

sbt.sh

@@ -1 +1 @@
-java -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -jar `dirname $0`/sbt-launch-0.12.3.jar "$@"
+java -Dsbt.log.noformat=true -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256m -Xmx512M -Xss2M -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -jar `dirname $0`/sbt-launch-0.13.1.jar "$@"

src/main/java/JettyLauncher.java

@@ -25,8 +25,8 @@ public class JettyLauncher {
                         port = Integer.parseInt(dim[1]);
                     } else if(dim[0].equals("--prefix")) {
                         contextPath = dim[1];
-                    } else if(dim[0].equals("--https") && (dim[1].equals("1") || dim[1].equals("true"))) {
-                        forceHttps = true;
+                    } else if(dim[0].equals("--gitbucket.home")){
+                        System.setProperty("gitbucket.home", dim[1]);
                     }
                 }
             }
@@ -34,7 +34,7 @@ public class JettyLauncher {
 
         Server server = new Server();
 
-        HttpsSupportConnector connector = new HttpsSupportConnector(forceHttps);
+        SelectChannelConnector connector = new SelectChannelConnector();
         if(host != null) {
             connector.setHost(host);
         }
@@ -51,25 +51,12 @@ public class JettyLauncher {
         context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
         context.setServer(server);
         context.setWar(location.toExternalForm());
+        if (forceHttps) {
+            context.setInitParameter("org.scalatra.ForceHttps", "true");
+        }
 
         server.setHandler(context);
         server.start();
         server.join();
     }
 }
-
-class HttpsSupportConnector extends SelectChannelConnector {
-    private boolean forceHttps;
-
-    public HttpsSupportConnector(boolean forceHttps) {
-        this.forceHttps = forceHttps;
-    }
-
-    @Override
-    public void customize(final EndPoint endpoint, final Request request) throws IOException {
-        if (this.forceHttps) {
-            request.setScheme("https");
-            super.customize(endpoint, request);
-        }
-    }
-}

src/main/java/util/PatchUtil.java

@@ -0,0 +1,93 @@
+package util;
+
+import org.eclipse.jgit.api.errors.PatchApplyException;
+import org.eclipse.jgit.diff.RawText;
+import org.eclipse.jgit.internal.JGitText;
+import org.eclipse.jgit.patch.FileHeader;
+import org.eclipse.jgit.patch.HunkHeader;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * This class helps to apply patch. Most of these code came from {@link org.eclipse.jgit.api.ApplyCommand}.
+ */
+public class PatchUtil {
+
+    public static String apply(String source, String patch, FileHeader fh)
+            throws IOException, PatchApplyException {
+        RawText rt = new RawText(source.getBytes("UTF-8"));
+        List<String> oldLines = new ArrayList<String>(rt.size());
+        for (int i = 0; i < rt.size(); i++)
+            oldLines.add(rt.getString(i));
+        List<String> newLines = new ArrayList<String>(oldLines);
+        for (HunkHeader hh : fh.getHunks()) {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            out.write(patch.getBytes("UTF-8"), hh.getStartOffset(), hh.getEndOffset() - hh.getStartOffset());
+            RawText hrt = new RawText(out.toByteArray());
+            List<String> hunkLines = new ArrayList<String>(hrt.size());
+            for (int i = 0; i < hrt.size(); i++)
+                hunkLines.add(hrt.getString(i));
+            int pos = 0;
+            for (int j = 1; j < hunkLines.size(); j++) {
+                String hunkLine = hunkLines.get(j);
+                switch (hunkLine.charAt(0)) {
+                    case ' ':
+                        if (!newLines.get(hh.getNewStartLine() - 1 + pos).equals(
+                                hunkLine.substring(1))) {
+                            throw new PatchApplyException(MessageFormat.format(
+                                    JGitText.get().patchApplyException, hh));
+                        }
+                        pos++;
+                        break;
+                    case '-':
+                        if (!newLines.get(hh.getNewStartLine() - 1 + pos).equals(
+                                hunkLine.substring(1))) {
+                            throw new PatchApplyException(MessageFormat.format(
+                                    JGitText.get().patchApplyException, hh));
+                        }
+                        newLines.remove(hh.getNewStartLine() - 1 + pos);
+                        break;
+                    case '+':
+                        newLines.add(hh.getNewStartLine() - 1 + pos,
+                                hunkLine.substring(1));
+                        pos++;
+                        break;
+                }
+            }
+        }
+        if (!isNoNewlineAtEndOfFile(fh))
+            newLines.add(""); //$NON-NLS-1$
+        if (!rt.isMissingNewlineAtEnd())
+            oldLines.add(""); //$NON-NLS-1$
+        if (!isChanged(oldLines, newLines))
+            return null; // don't touch the file
+        StringBuilder sb = new StringBuilder();
+        for (String l : newLines) {
+            // don't bother handling line endings - if it was windows, the \r is
+            // still there!
+            sb.append(l).append('\n');
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+
+    private static boolean isChanged(List<String> ol, List<String> nl) {
+        if (ol.size() != nl.size())
+            return true;
+        for (int i = 0; i < ol.size(); i++)
+            if (!ol.get(i).equals(nl.get(i)))
+                return true;
+        return false;
+    }
+
+    private static boolean isNoNewlineAtEndOfFile(FileHeader fh) {
+        HunkHeader lastHunk = fh.getHunks().get(fh.getHunks().size() - 1);
+        RawText lhrt = new RawText(lastHunk.getBuffer());
+        return lhrt.getString(lhrt.size() - 1).equals(
+                "\\ No newline at end of file"); //$NON-NLS-1$
+    }
+}

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

@@ -0,0 +1,11 @@
+ALTER TABLE GROUP_MEMBER ADD COLUMN MANAGER BOOLEAN DEFAULT FALSE;
+
+CREATE TABLE SSH_KEY (
+  USER_NAME VARCHAR(100) NOT NULL,
+  SSH_KEY_ID INT AUTO_INCREMENT,
+  TITLE VARCHAR(100) NOT NULL,
+  PUBLIC_KEY TEXT NOT NULL
+);
+
+ALTER TABLE SSH_KEY ADD CONSTRAINT IDX_SSH_KEY_PK PRIMARY KEY (USER_NAME, SSH_KEY_ID);
+ALTER TABLE SSH_KEY ADD CONSTRAINT IDX_SSH_KEY_FK0 FOREIGN KEY (USER_NAME) REFERENCES ACCOUNT (USER_NAME);

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

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

src/main/scala/ScalatraBootstrap.scala

@@ -1,17 +1,25 @@
+import _root_.servlet.{BasicAuthenticationFilter, TransactionFilter}
 import app._
+import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
 import org.scalatra._
 import javax.servlet._
+import java.util.EnumSet
 
 class ScalatraBootstrap extends LifeCycle {
   override def init(context: ServletContext) {
+    // Register TransactionFilter and BasicAuthenticationFilter at first
+    context.addFilter("transactionFilter", new TransactionFilter)
+    context.getFilterRegistration("transactionFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/*")
+    context.addFilter("basicAuthenticationFilter", new BasicAuthenticationFilter)
+    context.getFilterRegistration("basicAuthenticationFilter").addMappingForUrlPatterns(EnumSet.allOf(classOf[DispatcherType]), true, "/git/*")
+
+    // Register controllers
     context.mount(new IndexController, "/")
     context.mount(new SearchController, "/")
     context.mount(new FileUploadController, "/upload")
-    context.mount(new SignInController, "/*")
     context.mount(new DashboardController, "/*")
     context.mount(new UserManagementController, "/*")
     context.mount(new SystemSettingsController, "/*")
-    context.mount(new CreateRepositoryController, "/*")
     context.mount(new AccountController, "/*")
     context.mount(new RepositoryViewerController, "/*")
     context.mount(new WikiController, "/*")
@@ -20,7 +28,9 @@ class ScalatraBootstrap extends LifeCycle {
     context.mount(new IssuesController, "/*")
     context.mount(new PullRequestsController, "/*")
     context.mount(new RepositorySettingsController, "/*")
+    context.mount(new ValidationJavaScriptProvider, "/assets/common/js/*")
 
+    // Create GITBUCKET_HOME directory if it does not exist
     val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
     if(!dir.exists){
       dir.mkdirs()

src/main/scala/app/AccountController.scala

@@ -1,19 +1,25 @@
 package app
 
 import service._
-import util.{FileUtil, OneselfAuthenticator}
+import util._
 import util.StringUtil._
 import util.Directory._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
-import org.scalatra.FlashMapSupport
+import org.apache.commons.io.FileUtils
+import org.scalatra.i18n.Messages
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.eclipse.jgit.dircache.DirCache
+import model.GroupMember
 
 class AccountController extends AccountControllerBase
-  with SystemSettingsService with AccountService with RepositoryService with ActivityService
-  with OneselfAuthenticator
+  with AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
+  with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator
 
-trait AccountControllerBase extends AccountManagementControllerBase with FlashMapSupport {
-  self: SystemSettingsService with AccountService with RepositoryService with ActivityService
-    with OneselfAuthenticator =>
+trait AccountControllerBase extends AccountManagementControllerBase {
+  self: AccountService with RepositoryService with ActivityService with WikiService with LabelsService with SshKeyService
+    with OneselfAuthenticator with UsersAuthenticator with GroupManagerAuthenticator with ReadableUsersAuthenticator =>
 
   case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
                             url: Option[String], fileId: Option[String])
@@ -21,6 +27,8 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
   case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
                              url: Option[String], fileId: Option[String], clearImage: Boolean)
 
+  case class SshKeyForm(title: String, publicKey: String)
+
   val newForm = mapping(
     "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName))),
     "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
@@ -39,6 +47,45 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     "clearImage"  -> trim(label("Clear image"  , boolean()))
   )(AccountEditForm.apply)
 
+  val sshKeyForm = mapping(
+    "title"     -> trim(label("Title", text(required, maxlength(100)))),
+    "publicKey" -> trim(label("Key"  , text(required)))
+  )(SshKeyForm.apply)
+
+  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
+  case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String, clearImage: Boolean)
+
+  val newGroupForm = mapping(
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
+    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "fileId"    -> trim(label("File ID"    ,optional(text()))),
+    "members"   -> trim(label("Members"    ,text(required, members)))
+  )(NewGroupForm.apply)
+
+  val editGroupForm = mapping(
+    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "fileId"     -> trim(label("File ID"     ,optional(text()))),
+    "members"    -> trim(label("Members"     ,text(required, members))),
+    "clearImage" -> trim(label("Clear image" ,boolean()))
+  )(EditGroupForm.apply)
+
+  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
+  case class ForkRepositoryForm(owner: String, name: String)
+
+  val newRepositoryForm = mapping(
+    "owner"        -> trim(label("Owner"          , text(required, maxlength(40), identifier, existsAccount))),
+    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))),
+    "description"  -> trim(label("Description"    , optional(text()))),
+    "isPrivate"    -> trim(label("Repository Type", boolean())),
+    "createReadme" -> trim(label("Create README"  , boolean()))
+  )(RepositoryCreationForm.apply)
+
+  val forkRepositoryForm = mapping(
+    "owner" -> trim(label("Repository owner", text(required))),
+    "name"  -> trim(label("Repository name",  text(required)))
+  )(ForkRepositoryForm.apply)
+
   /**
    * Displays user information.
    */
@@ -53,14 +100,20 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
             getActivitiesByUser(userName, true))
 
         // Members
-        case "members" if(account.isGroupAccount) =>
-          _root_.account.html.members(account, getGroupMembers(account.userName))
+        case "members" if(account.isGroupAccount) => {
+          val members = getGroupMembers(account.userName)
+          _root_.account.html.members(account, members.map(_.userName),
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+        }
 
         // Repositories
-        case _ =>
+        case _ => {
+          val members = getGroupMembers(account.userName)
           _root_.account.html.repositories(account,
             if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)))
+            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)),
+            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
+        }
       }
     } getOrElse NotFound
   }
@@ -78,7 +131,9 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   get("/:userName/_edit")(oneselfOnly {
     val userName = params("userName")
-    getAccountByUserName(userName).map(x => account.html.edit(Some(x), flash.get("info"))) getOrElse NotFound
+    getAccountByUserName(userName).map { x =>
+      account.html.edit(x, flash.get("info"))
+    } getOrElse NotFound
   })
 
   post("/:userName/_edit", editForm)(oneselfOnly { form =>
@@ -97,22 +152,287 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     } getOrElse NotFound
   })
 
+  get("/:userName/_delete")(oneselfOnly {
+    val userName = params("userName")
+
+    getAccountByUserName(userName, true).foreach { account =>
+      // Remove repositories
+      getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+        deleteRepository(userName, repositoryName)
+        FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+        FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+        FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+      }
+      // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+      removeUserRelatedData(userName)
+
+      updateAccount(account.copy(isRemoved = true))
+    }
+
+    session.invalidate
+    redirect("/")
+  })
+
+  get("/:userName/_ssh")(oneselfOnly {
+    val userName = params("userName")
+    getAccountByUserName(userName).map { x =>
+      account.html.ssh(x, getPublicKeys(x.userName))
+    } getOrElse NotFound
+  })
+
+  post("/:userName/_ssh", sshKeyForm)(oneselfOnly { form =>
+    val userName = params("userName")
+    addPublicKey(userName, form.title, form.publicKey)
+    redirect(s"/${userName}/_ssh")
+  })
+
+  get("/:userName/_ssh/delete/:id")(oneselfOnly {
+    val userName = params("userName")
+    val sshKeyId = params("id").toInt
+    deletePublicKey(userName, sshKeyId)
+    redirect(s"/${userName}/_ssh")
+  })
+
   get("/register"){
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
       if(context.loginAccount.isDefined){
         redirect("/")
       } else {
-        account.html.edit(None, None)
+        account.html.register()
       }
     } else NotFound
   }
 
   post("/register", newForm){ form =>
-    if(loadSystemSettings().allowAccountRegistration){
+    if(context.settings.allowAccountRegistration){
       createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
       updateImage(form.userName, form.fileId, false)
       redirect("/signin")
     } else NotFound
   }
 
+  get("/groups/new")(usersOnly {
+    account.html.group(None, List(GroupMember("", context.loginAccount.get.userName, true)))
+  })
+
+  post("/groups/new", newGroupForm)(usersOnly { form =>
+    createGroup(form.groupName, form.url)
+    updateGroupMembers(form.groupName, form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList)
+    updateImage(form.groupName, form.fileId, false)
+    redirect(s"/${form.groupName}")
+  })
+
+  get("/:groupName/_editgroup")(managersOnly {
+    defining(params("groupName")){ groupName =>
+      account.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
+    }
+  })
+
+  get("/:groupName/_deletegroup")(managersOnly {
+    defining(params("groupName")){ groupName =>
+      // Remove from GROUP_MEMBER
+      updateGroupMembers(groupName, Nil)
+      // Remove repositories
+      getRepositoryNamesOfUser(groupName).foreach { repositoryName =>
+        deleteRepository(groupName, repositoryName)
+        FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+        FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+        FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+      }
+    }
+    redirect("/")
+  })
+
+  post("/:groupName/_editgroup", editGroupForm)(managersOnly { form =>
+    defining(params("groupName"), form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList){ case (groupName, members) =>
+      getAccountByUserName(groupName, true).map { account =>
+        updateGroup(groupName, form.url, false)
+
+        // Update GROUP_MEMBER
+        updateGroupMembers(form.groupName, members)
+        // Update COLLABORATOR for group repositories
+        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+          removeCollaborators(form.groupName, repositoryName)
+          members.foreach { case (userName, isManager) =>
+            addCollaborator(form.groupName, repositoryName, userName)
+          }
+        }
+
+        updateImage(form.groupName, form.fileId, form.clearImage)
+        redirect(s"/${form.groupName}")
+
+      } getOrElse NotFound
+    }
+  })
+
+  /**
+   * Show the new repository form.
+   */
+  get("/new")(usersOnly {
+    account.html.newrepo(getGroupsByUserName(context.loginAccount.get.userName))
+  })
+
+  /**
+   * Create new repository.
+   */
+  post("/new", newRepositoryForm)(usersOnly { form =>
+    LockUtil.lock(s"${form.owner}/${form.name}/create"){
+      if(getRepository(form.owner, form.name, baseUrl).isEmpty){
+        val ownerAccount  = getAccountByUserName(form.owner).get
+        val loginAccount  = context.loginAccount.get
+        val loginUserName = loginAccount.userName
+
+        // Insert to the database at first
+        createRepository(form.name, form.owner, form.description, form.isPrivate)
+
+        // Add collaborators for group repository
+        if(ownerAccount.isGroupAccount){
+          getGroupMembers(form.owner).foreach { member =>
+            addCollaborator(form.owner, form.name, member.userName)
+          }
+        }
+
+        // Insert default labels
+        insertDefaultLabels(form.owner, form.name)
+
+        // Create the actual repository
+        val gitdir = getRepositoryDir(form.owner, form.name)
+        JGitUtil.initRepository(gitdir)
+
+        if(form.createReadme){
+          using(Git.open(gitdir)){ git =>
+            val builder  = DirCache.newInCore.builder()
+            val inserter = git.getRepository.newObjectInserter()
+            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+            val content  = if(form.description.nonEmpty){
+              form.name + "\n" +
+              "===============\n" +
+              "\n" +
+              form.description.get
+            } else {
+              form.name + "\n" +
+              "===============\n"
+            }
+
+            builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE,
+              inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+            builder.finish()
+
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+              loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
+          }
+        }
+
+        // Create Wiki repository
+        createWikiRepository(loginAccount, form.owner, form.name)
+
+        // Record activity
+        recordCreateRepositoryActivity(form.owner, form.name, loginUserName)
+      }
+
+      // redirect to the repository
+      redirect(s"/${form.owner}/${form.name}")
+    }
+  })
+
+  get("/:owner/:repository/fork")(readableUsersOnly { repository =>
+    val loginAccount   = context.loginAccount.get
+    val loginUserName  = loginAccount.userName
+
+    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
+      if(repository.owner == loginUserName){
+        // redirect to the repository
+        redirect(s"/${repository.owner}/${repository.name}")
+      } else {
+        getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) =>
+          // redirect to the repository
+          redirect(s"/${owner}/${name}")
+        } getOrElse {
+          // Insert to the database at first
+          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+
+          createRepository(
+            repositoryName       = repository.name,
+            userName             = loginUserName,
+            description          = repository.repository.description,
+            isPrivate            = repository.repository.isPrivate,
+            originRepositoryName = Some(originRepositoryName),
+            originUserName       = Some(originUserName),
+            parentRepositoryName = Some(repository.name),
+            parentUserName       = Some(repository.owner)
+          )
+
+          // Insert default labels
+          insertDefaultLabels(loginUserName, repository.name)
+
+          // clone repository actually
+          JGitUtil.cloneRepository(
+            getRepositoryDir(repository.owner, repository.name),
+            getRepositoryDir(loginUserName, repository.name))
+
+          // Create Wiki repository
+          JGitUtil.cloneRepository(
+            getWikiRepositoryDir(repository.owner, repository.name),
+            getWikiRepositoryDir(loginUserName, repository.name))
+
+          // insert commit id
+          using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
+            JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
+              JGitUtil.getCommitLog(git, branch) match {
+                case Right((commits, _)) => commits.foreach { commit =>
+                  if(!existsCommitId(loginUserName, repository.name, commit.id)){
+                    insertCommitId(loginUserName, repository.name, commit.id)
+                  }
+                }
+                case Left(_) => ???
+              }
+            }
+          }
+
+          // Record activity
+          recordForkActivity(repository.owner, repository.name, loginUserName)
+          // redirect to the repository
+          redirect(s"/${loginUserName}/${repository.name}")
+        }
+      }
+    }
+  })
+
+  private def insertDefaultLabels(userName: String, repositoryName: String): Unit = {
+    createLabel(userName, repositoryName, "bug", "fc2929")
+    createLabel(userName, repositoryName, "duplicate", "cccccc")
+    createLabel(userName, repositoryName, "enhancement", "84b6eb")
+    createLabel(userName, repositoryName, "invalid", "e6e6e6")
+    createLabel(userName, repositoryName, "question", "cc317c")
+    createLabel(userName, repositoryName, "wontfix", "ffffff")
+  }
+
+  private def existsAccount: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
+  }
+
+  private def uniqueRepository: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("owner").flatMap { userName =>
+        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+      }
+  }
+
+  private def members: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      if(value.split(",").exists {
+        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+      }) None else Some("Must select one manager at least.")
+    }
+  }
 }

src/main/scala/app/ControllerBase.scala

@@ -3,31 +3,32 @@ package app
 import _root_.util.Directory._
 import _root_.util.Implicits._
 import _root_.util.ControlUtil._
-import _root_.util.{FileUtil, Validations, Keys}
+import _root_.util.{StringUtil, FileUtil, Validations, Keys}
 import org.scalatra._
 import org.scalatra.json._
 import org.json4s._
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import model.Account
-import scala.Some
-import service.AccountService
+import service.{SystemSettingsService, AccountService}
 import javax.servlet.http.{HttpServletResponse, HttpSession, HttpServletRequest}
 import java.text.SimpleDateFormat
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
+import org.scalatra.i18n._
 
 /**
  * Provides generic features for controller implementations.
  */
 abstract class ControllerBase extends ScalatraFilter
-  with ClientSideValidationFormSupport with JacksonJsonSupport with Validations {
+  with ClientSideValidationFormSupport with JacksonJsonSupport with I18nSupport with FlashMapSupport with Validations
+  with SystemSettingsService {
 
   implicit val jsonFormats = DefaultFormats
 
   // Don't set content type via Accept header.
   override def format(implicit request: HttpServletRequest) = ""
 
-  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain) {
+  override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
     val httpRequest  = request.asInstanceOf[HttpServletRequest]
     val httpResponse = response.asInstanceOf[HttpServletResponse]
     val context      = request.getServletContext.getContextPath
@@ -35,15 +36,16 @@ abstract class ControllerBase extends ScalatraFilter
 
     if(path.startsWith("/console/")){
       val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+      val baseUrl = this.baseUrl(httpRequest)
       if(account == null){
         // Redirect to login form
-        httpResponse.sendRedirect(context + "/signin?" + path)
+        httpResponse.sendRedirect(baseUrl + "/signin?redirect=" + StringUtil.urlEncode(path))
       } else if(account.isAdmin){
         // H2 Console (administrators only)
         chain.doFilter(request, response)
       } else {
         // Redirect to dashboard
-        httpResponse.sendRedirect(context + "/")
+        httpResponse.sendRedirect(baseUrl + "/")
       }
     } else if(path.startsWith("/git/")){
       // Git repository
@@ -52,15 +54,24 @@ abstract class ControllerBase extends ScalatraFilter
       // Scalatra actions
       super.doFilter(request, response, chain)
     }
+  } finally {
+    contextCache.remove();
   }
 
+  private val contextCache = new java.lang.ThreadLocal[Context]()
+
   /**
    * Returns the context object for the request.
    */
-  implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL, request)
-
-  private def currentURL: String = defining(request.getQueryString){ queryString =>
-    request.getRequestURI + (if(queryString != null) "?" + queryString else "")
+  implicit def context: Context = {
+    contextCache.get match {
+      case null => {
+        val context = Context(loadSystemSettings(), LoginAccount, request)
+        contextCache.set(context)
+        context
+      }
+      case context => context
+    }
   }
 
   private def LoginAccount: Option[Account] = session.getAs[Account](Keys.Session.LoginAccount)
@@ -71,7 +82,7 @@ abstract class ControllerBase extends ScalatraFilter
       action
     }
 
-  override def ajaxGet[T](path : String, form : MappingValueType[T])(action : T => Any) : Route =
+  override def ajaxGet[T](path : String, form : ValueType[T])(action : T => Any) : Route =
     super.ajaxGet(path, form){ form =>
       request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
@@ -83,7 +94,7 @@ abstract class ControllerBase extends ScalatraFilter
       action
     }
 
-  override def ajaxPost[T](path : String, form : MappingValueType[T])(action : T => Any) : Route =
+  override def ajaxPost[T](path : String, form : ValueType[T])(action : T => Any) : Route =
     super.ajaxPost(path, form){ form =>
       request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
@@ -106,27 +117,31 @@ abstract class ControllerBase extends ScalatraFilter
         if(request.getMethod.toUpperCase == "POST"){
           org.scalatra.Unauthorized(redirect("/signin"))
         } else {
-          org.scalatra.Unauthorized(redirect("/signin?redirect=" + currentURL))
+          org.scalatra.Unauthorized(redirect("/signin?redirect=" + StringUtil.urlEncode(
+            defining(request.getQueryString){ queryString =>
+              request.getRequestURI.substring(request.getContextPath.length) + (if(queryString != null) "?" + queryString else "")
+            }
+          )))
         }
       }
     }
 
-  protected def baseUrl = defining(request.getRequestURL.toString){ url =>
-    url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
-  }
+  override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+                       includeContextPath: Boolean = true, includeServletPath: Boolean = true)
+                      (implicit request: HttpServletRequest, response: HttpServletResponse) =
+    if (path.startsWith("http")) path
+    else baseUrl + url(path, params, false, false, false)
 
 }
 
 /**
  * Context object for the current request.
  */
-case class Context(path: String, loginAccount: Option[Account], currentUrl: String, request: HttpServletRequest){
+case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
 
-  def redirectUrl = if(request.getParameter("redirect") != null){
-    request.getParameter("redirect")
-  } else {
-    currentUrl
-  }
+  lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
+
+  lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
 
   /**
    * Get object from cache.
@@ -169,13 +184,13 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
     }
 
   protected def uniqueUserName: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
-      getAccountByUserName(value).map { _ => "User already exists." }
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value, true).map { _ => "User already exists." }
   }
 
   protected def uniqueMailAddress(paramName: String = ""): Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String]): Option[String] =
-      getAccountByMailAddress(value)
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      getAccountByMailAddress(value, true)
         .filter { x => if(paramName.isEmpty) true else Some(x.userName) != params.get(paramName) }
         .map    { _ => "Mail address is already registered." }
   }

src/main/scala/app/CreateRepositoryController.scala

@@ -1,193 +0,0 @@
-package app
-
-import util.Directory._
-import util.ControlUtil._
-import util._
-import service._
-import java.io.File
-import org.eclipse.jgit.api.Git
-import org.apache.commons.io._
-import jp.sf.amateras.scalatra.forms._
-import org.eclipse.jgit.lib.PersonIdent
-
-class CreateRepositoryController extends CreateRepositoryControllerBase
-  with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
-  with UsersAuthenticator with ReadableUsersAuthenticator
-
-/**
- * Creates new repository.
- */
-trait CreateRepositoryControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with WikiService with LabelsService with ActivityService
-    with UsersAuthenticator with ReadableUsersAuthenticator =>
-
-  case class RepositoryCreationForm(owner: String, name: String, description: Option[String], isPrivate: Boolean, createReadme: Boolean)
-
-  case class ForkRepositoryForm(owner: String, name: String)
-
-  val newForm = mapping(
-    "owner"        -> trim(label("Owner"          , text(required, maxlength(40), identifier, existsAccount))),
-    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, unique))),
-    "description"  -> trim(label("Description"    , optional(text()))),
-    "isPrivate"    -> trim(label("Repository Type", boolean())),
-    "createReadme" -> trim(label("Create README"  , boolean()))
-  )(RepositoryCreationForm.apply)
-
-  val forkForm = mapping(
-    "owner" -> trim(label("Repository owner", text(required))),
-    "name"  -> trim(label("Repository name",  text(required)))
-  )(ForkRepositoryForm.apply)
-
-  /**
-   * Show the new repository form.
-   */
-  get("/new")(usersOnly {
-    html.newrepo(getGroupsByUserName(context.loginAccount.get.userName))
-  })
-  
-  /**
-   * Create new repository.
-   */
-  post("/new", newForm)(usersOnly { form =>
-    LockUtil.lock(s"${form.owner}/${form.name}/create"){
-      if(getRepository(form.owner, form.name, baseUrl).isEmpty){
-        val ownerAccount  = getAccountByUserName(form.owner).get
-        val loginAccount  = context.loginAccount.get
-        val loginUserName = loginAccount.userName
-
-        // Insert to the database at first
-        createRepository(form.name, form.owner, form.description, form.isPrivate)
-
-        // Add collaborators for group repository
-        if(ownerAccount.isGroupAccount){
-          getGroupMembers(form.owner).foreach { userName =>
-            addCollaborator(form.owner, form.name, userName)
-          }
-        }
-
-        // Insert default labels
-        insertDefaultLabels(form.owner, form.name)
-
-        // Create the actual repository
-        val gitdir = getRepositoryDir(form.owner, form.name)
-        JGitUtil.initRepository(gitdir)
-
-        if(form.createReadme){
-          FileUtil.withTmpDir(getInitRepositoryDir(form.owner, form.name)){ tmpdir =>
-            // Clone the repository
-            Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
-
-            // Create README.md
-            FileUtils.writeStringToFile(new File(tmpdir, "README.md"),
-              if(form.description.nonEmpty){
-                form.name + "\n" +
-                  "===============\n" +
-                  "\n" +
-                  form.description.get
-              } else {
-                form.name + "\n" +
-                  "===============\n"
-              }, "UTF-8")
-
-            val git = Git.open(tmpdir)
-            git.add.addFilepattern("README.md").call
-            git.commit
-              .setCommitter(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-              .setMessage("Initial commit").call
-            git.push.call
-          }
-        }
-
-        // Create Wiki repository
-        createWikiRepository(loginAccount, form.owner, form.name)
-
-        // Record activity
-        recordCreateRepositoryActivity(form.owner, form.name, loginUserName)
-      }
-
-      // redirect to the repository
-      redirect(s"/${form.owner}/${form.name}")
-    }
-  })
-
-  get("/:owner/:repository/fork")(readableUsersOnly { repository =>
-    val loginAccount   = context.loginAccount.get
-    val loginUserName  = loginAccount.userName
-
-    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
-      if(getRepository(loginUserName, repository.name, baseUrl).isEmpty){
-        // Insert to the database at first
-        val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
-        val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
-
-        createRepository(
-          repositoryName       = repository.name,
-          userName             = loginUserName,
-          description          = repository.repository.description,
-          isPrivate            = repository.repository.isPrivate,
-          originRepositoryName = Some(originRepositoryName),
-          originUserName       = Some(originUserName),
-          parentRepositoryName = Some(repository.name),
-          parentUserName       = Some(repository.owner)
-        )
-
-        // Insert default labels
-        insertDefaultLabels(loginUserName, repository.name)
-
-        // clone repository actually
-        JGitUtil.cloneRepository(
-          getRepositoryDir(repository.owner, repository.name),
-          getRepositoryDir(loginUserName, repository.name))
-
-        // Create Wiki repository
-        JGitUtil.cloneRepository(
-          getWikiRepositoryDir(repository.owner, repository.name),
-          getWikiRepositoryDir(loginUserName, repository.name))
-
-        // insert commit id
-        using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
-          JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
-            JGitUtil.getCommitLog(git, branch) match {
-              case Right((commits, _)) => commits.foreach { commit =>
-                if(!existsCommitId(loginUserName, repository.name, commit.id)){
-                  insertCommitId(loginUserName, repository.name, commit.id)
-                }
-              }
-              case Left(_) => ???
-            }
-          }
-        }
-
-        // Record activity
-        recordForkActivity(repository.owner, repository.name, loginUserName)
-      }
-      // redirect to the repository
-      redirect("/%s/%s".format(loginUserName, repository.name))
-    }
-  })
-
-  private def insertDefaultLabels(userName: String, repositoryName: String): Unit = {
-    createLabel(userName, repositoryName, "bug", "fc2929")
-    createLabel(userName, repositoryName, "duplicate", "cccccc")
-    createLabel(userName, repositoryName, "enhancement", "84b6eb")
-    createLabel(userName, repositoryName, "invalid", "e6e6e6")
-    createLabel(userName, repositoryName, "question", "cc317c")
-    createLabel(userName, repositoryName, "wontfix", "ffffff")
-  }
-
-  private def existsAccount: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
-      if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
-  }
-
-  /**
-   * Duplicate check for the repository name.
-   */
-  private def unique: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String]): Option[String] =
-      params.get("owner").flatMap { userName =>
-        getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
-      }
-  }
-  
-}

src/main/scala/app/FileUploadController.scala

@@ -12,8 +12,7 @@ import org.apache.commons.io.FileUtils
  * This servlet saves uploaded file as temporary file and returns the unique id.
  * You can get uploaded file using [[app.FileUploadControllerBase#getTemporaryFile()]] with this id.
  */
-class FileUploadController extends ScalatraServlet
-  with FileUploadSupport with FlashMapSupport with FileUploadControllerBase {
+class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase {
 
   configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))
 

src/main/scala/app/IndexController.scala

@@ -5,23 +5,65 @@ import service._
 import jp.sf.amateras.scalatra.forms._
 
 class IndexController extends IndexControllerBase 
-  with RepositoryService with SystemSettingsService with ActivityService with AccountService
-with UsersAuthenticator
+  with RepositoryService with ActivityService with AccountService with UsersAuthenticator
 
 trait IndexControllerBase extends ControllerBase {
-  self: RepositoryService with SystemSettingsService with ActivityService with AccountService
-  with UsersAuthenticator =>
+  self: RepositoryService with ActivityService with AccountService with UsersAuthenticator =>
+
+  case class SignInForm(userName: String, password: String)
+
+  val form = mapping(
+    "userName" -> trim(label("Username", text(required))),
+    "password" -> trim(label("Password", text(required)))
+  )(SignInForm.apply)
 
   get("/"){
     val loginAccount = context.loginAccount
 
     html.index(getRecentActivities(),
       getVisibleRepositories(loginAccount, baseUrl),
-      loadSystemSettings(),
       loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
     )
   }
 
+  get("/signin"){
+    val redirect = params.get("redirect")
+    if(redirect.isDefined && redirect.get.startsWith("/")){
+      flash += Keys.Flash.Redirect -> redirect.get
+    }
+    html.signin()
+  }
+
+  post("/signin", form){ form =>
+    authenticate(context.settings, form.userName, form.password) match {
+      case Some(account) => signin(account)
+      case None          => redirect("/signin")
+    }
+  }
+
+  get("/signout"){
+    session.invalidate
+    redirect("/")
+  }
+
+  /**
+   * Set account information into HttpSession and redirect.
+   */
+  private def signin(account: model.Account) = {
+    session.setAttribute(Keys.Session.LoginAccount, account)
+    updateLastLoginDate(account.userName)
+
+    flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(redirectUrl)
+      }
+    }.getOrElse {
+      redirect("/")
+    }
+  }
+
   /**
    * JSON API for collaborator completion.
    *
@@ -30,7 +72,7 @@ trait IndexControllerBase extends ControllerBase {
   get("/_user/proposals")(usersOnly {
     contentType = formats("json")
     org.json4s.jackson.Serialization.write(
-      Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray)
+      Map("options" -> getAllUsers().filter(!_.isGroupAccount).map(_.userName).toArray)
     )
   })
 

src/main/scala/app/IssuesController.scala

@@ -4,10 +4,11 @@ import jp.sf.amateras.scalatra.forms._
 
 import service._
 import IssuesService._
-import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, ReadableUsersAuthenticator, Notifier, Keys}
+import util._
 import util.Implicits._
 import util.ControlUtil._
 import org.scalatra.Ok
+import model.Issue
 
 class IssuesController extends IssuesControllerBase
   with IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService
@@ -110,6 +111,11 @@ trait IssuesControllerBase extends ControllerBase {
       // record activity
       recordCreateIssueActivity(owner, name, userName, issueId, form.title)
 
+      // extract references and create refer comment
+      getIssue(owner, name, issueId.toString).foreach { issue =>
+        createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
+      }
+
       // notifications
       Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
         Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
@@ -123,7 +129,11 @@ trait IssuesControllerBase extends ControllerBase {
     defining(repository.owner, repository.name){ case (owner, name) =>
       getIssue(owner, name, params("id")).map { issue =>
         if(isEditable(owner, name, issue.openedUserName)){
+          // update issue
           updateIssue(owner, name, issue.issueId, form.title, form.content)
+          // extract references and create refer comment
+          createReferComment(owner, name, issue, form.title + " " + form.content.getOrElse(""))
+
           redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
         } else Unauthorized
       } getOrElse NotFound
@@ -274,6 +284,15 @@ trait IssuesControllerBase extends ControllerBase {
     redirect(s"/${repository.owner}/${repository.name}/issues")
   }
 
+  private def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String) = {
+    StringUtil.extractIssueId(message).foreach { issueId =>
+      if(getIssue(owner, repository, issueId).isDefined){
+        createComment(owner, repository, context.loginAccount.get.userName, issueId.toInt,
+                      fromIssue.issueId + ":" + fromIssue.title, "refer")
+      }
+    }
+  }
+
   /**
    * @see [[https://github.com/takezoe/gitbucket/wiki/CommentAction]]
    */
@@ -313,6 +332,11 @@ trait IssuesControllerBase extends ControllerBase {
         }
         recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
 
+        // extract references and create refer comment
+        content.map { content =>
+          createReferComment(owner, name, issue, content)
+        }
+
         // notifications
         Notifier() match {
           case f =>

src/main/scala/app/LabelsController.scala

@@ -3,6 +3,7 @@ package app
 import jp.sf.amateras.scalatra.forms._
 import service._
 import util.CollaboratorsAuthenticator
+import org.scalatra.i18n.Messages
 
 class LabelsController extends LabelsControllerBase
   with LabelsService with RepositoryService with AccountService with CollaboratorsAuthenticator
@@ -51,7 +52,7 @@ trait LabelsControllerBase extends ControllerBase {
    * Constraint for the identifier such as user name, repository name or page name.
    */
   private def labelName: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       if(!value.matches("^[^,]+$")){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){

src/main/scala/app/PullRequestsController.scala

@@ -4,38 +4,42 @@ import util.{LockUtil, CollaboratorsAuthenticator, JGitUtil, ReferrerAuthenticat
 import util.Directory._
 import util.Implicits._
 import util.ControlUtil._
-import util.FileUtil._
 import service._
 import org.eclipse.jgit.api.Git
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.transport.RefSpec
-import org.apache.commons.io.FileUtils
 import scala.collection.JavaConverters._
-import org.eclipse.jgit.lib.PersonIdent
-import org.eclipse.jgit.api.MergeCommand.FastForwardMode
+import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
 import service.IssuesService._
 import service.PullRequestService._
 import util.JGitUtil.DiffInfo
 import service.RepositoryService.RepositoryTreeNode
 import util.JGitUtil.CommitInfo
+import org.slf4j.LoggerFactory
+import org.eclipse.jgit.merge.MergeStrategy
+import org.eclipse.jgit.errors.NoMergeBaseException
+import service.WebHookService.WebHookPayload
 
 class PullRequestsController extends PullRequestsControllerBase
-  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
-  with ReferrerAuthenticator with CollaboratorsAuthenticator
+  with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with LabelsService
+  with ActivityService with WebHookService with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait PullRequestsControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with IssuesService with MilestonesService with ActivityService with PullRequestService
-    with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+  self: RepositoryService with AccountService with IssuesService with MilestonesService with LabelsService
+    with ActivityService with PullRequestService with WebHookService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+
+  private val logger = LoggerFactory.getLogger(classOf[PullRequestsControllerBase])
 
   val pullRequestForm = mapping(
-    "title"           -> trim(label("Title"  , text(required, maxlength(100)))),
-    "content"         -> trim(label("Content", optional(text()))),
-    "targetUserName"  -> trim(text(required, maxlength(100))),
-    "targetBranch"    -> trim(text(required, maxlength(100))),
-    "requestUserName" -> trim(text(required, maxlength(100))),
-    "requestBranch"   -> trim(text(required, maxlength(100))),
-    "commitIdFrom"    -> trim(text(required, maxlength(40))),
-    "commitIdTo"      -> trim(text(required, maxlength(40)))
+    "title"                 -> trim(label("Title"  , text(required, maxlength(100)))),
+    "content"               -> trim(label("Content", optional(text()))),
+    "targetUserName"        -> trim(text(required, maxlength(100))),
+    "targetBranch"          -> trim(text(required, maxlength(100))),
+    "requestUserName"       -> trim(text(required, maxlength(100))),
+    "requestRepositoryName" -> trim(text(required, maxlength(100))),
+    "requestBranch"         -> trim(text(required, maxlength(100))),
+    "commitIdFrom"          -> trim(text(required, maxlength(40))),
+    "commitIdTo"            -> trim(text(required, maxlength(40)))
   )(PullRequestForm.apply)
 
   val mergeForm = mapping(
@@ -48,6 +52,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     targetUserName: String,
     targetBranch: String,
     requestUserName: String,
+    requestRepositoryName: String,
     requestBranch: String,
     commitIdFrom: String,
     commitIdTo: String)
@@ -74,8 +79,10 @@ trait PullRequestsControllerBase extends ControllerBase {
           pulls.html.pullreq(
             issue, pullreq,
             getComments(owner, name, issueId),
+            getIssueLabels(owner, name, issueId),
             (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
             getMilestonesWithIssueCount(owner, name),
+            getLabels(owner, name),
             commits,
             diffs,
             hasWritePermission(owner, name, context.loginAccount),
@@ -88,83 +95,122 @@ trait PullRequestsControllerBase extends ControllerBase {
   ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
     params("id").toIntOpt.flatMap{ issueId =>
       val owner = repository.owner
-      val name = repository.name
+      val name  = repository.name
       getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
         pulls.html.mergeguide(
-          checkConflict(owner, name, pullreq.branch, owner, name, pullreq.requestBranch),
+          checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId),
           pullreq,
-          s"${baseUrl}${context.path}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
+          s"${baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
       }
     } getOrElse NotFound
   })
 
+  get("/:owner/:repository/pull/:id/delete/*")(collaboratorsOnly { repository =>
+    params("id").toIntOpt.map { issueId =>
+      val branchName = multiParams("splat").head
+      val userName   = context.loginAccount.get.userName
+      if(repository.repository.defaultBranch != branchName){
+        using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+          git.branchDelete().setBranchNames(branchName).call()
+          recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+        }
+      }
+      createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
+      redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
+    } getOrElse NotFound
+  })
+
   post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
-    params("id").toIntOpt.flatMap{ issueId =>
+    params("id").toIntOpt.flatMap { issueId =>
       val owner = repository.owner
-      val name = repository.name
+      val name  = repository.name
       LockUtil.lock(s"${owner}/${name}/merge"){
         getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
-          val remote = getRepositoryDir(owner, name)
-          withTmpDir(new java.io.File(getTemporaryDir(owner, name), s"merge-${issueId}")){ tmpdir =>
-            using(Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(pullreq.branch).call){ git =>
+          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")
+            createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
+            updateClosed(owner, name, issueId, true)
 
-              // mark issue as merged and close.
-              val loginAccount = context.loginAccount.get
-              createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
-              createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
-              updateClosed(owner, name, issueId, true)
+            // record activity
+            recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
 
-              // record activity
-              recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
-
-              // fetch pull request to temporary working repository
-              val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
-
-              git.fetch
-                .setRemote(getRepositoryDir(owner, name).toURI.toString)
-                .setRefSpecs(new RefSpec(s"refs/pull/${issueId}/head:refs/heads/${pullRequestBranchName}")).call
-
-              // merge pull request
-              git.checkout.setName(pullreq.branch).call
-
-              val result = git.merge
-                .include(git.getRepository.resolve(pullRequestBranchName))
-                .setFastForward(FastForwardMode.NO_FF)
-                .setCommit(false)
-                .call
-
-              if(result.getConflicts != null){
-                throw new RuntimeException("This pull request can't merge automatically.")
-              }
-
-              // merge commit
-              git.getRepository.writeMergeCommitMsg(
-                s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n"
-                + form.message)
-
-              git.commit
-                .setCommitter(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
-                .call
-
-              // push
-              git.push.call
-
-              val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
-                pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
-
-              commits.flatten.foreach { commit =>
-                if(!existsCommitId(owner, name, commit.id)){
-                  insertCommitId(owner, name, commit.id)
-                }
-              }
-
-              // notifications
-              Notifier().toNotify(repository, issueId, "merge"){
-                Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
-              }
-
-              redirect(s"/${owner}/${name}/pull/${issueId}")
+            // merge
+            val mergeBaseRefName = s"refs/heads/${pullreq.branch}"
+            val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
+            val mergeBaseTip = git.getRepository.resolve(mergeBaseRefName)
+            val mergeTip = git.getRepository.resolve(s"refs/pull/${issueId}/head")
+            val conflicted = try {
+              !merger.merge(mergeBaseTip, mergeTip)
+            } catch {
+              case e: NoMergeBaseException => true
             }
+            if (conflicted) {
+              throw new RuntimeException("This pull request can't merge automatically.")
+            }
+
+            // creates merge commit
+            val mergeCommit = new CommitBuilder()
+            mergeCommit.setTreeId(merger.getResultTreeId)
+            mergeCommit.setParentIds(Array[ObjectId](mergeBaseTip, mergeTip): _*)
+            val personIdent = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
+            mergeCommit.setAuthor(personIdent)
+            mergeCommit.setCommitter(personIdent)
+            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n\n" +
+                                   form.message)
+
+            // insertObject and got mergeCommit Object Id
+            val inserter = git.getRepository.newObjectInserter
+            val mergeCommitId = inserter.insert(mergeCommit)
+            inserter.flush()
+            inserter.release()
+
+            // update refs
+            val refUpdate = git.getRepository.updateRef(mergeBaseRefName)
+            refUpdate.setNewObjectId(mergeCommitId)
+            refUpdate.setForceUpdate(false)
+            refUpdate.setRefLogIdent(personIdent)
+            refUpdate.setRefLogMessage("merged", true)
+            refUpdate.update()
+
+            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
+              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
+
+            commits.flatten.foreach { commit =>
+              if(!existsCommitId(owner, name, commit.id)){
+                insertCommitId(owner, name, commit.id)
+              }
+            }
+
+            // close issue by content of pull request
+            val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch
+            if(pullreq.branch == defaultBranch){
+              commits.flatten.foreach { commit =>
+                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
+              }
+              issue.content match {
+                case Some(content) => closeIssuesFromMessage(content, loginAccount.userName, owner, name)
+                case _ =>
+              }
+              closeIssuesFromMessage(form.message, loginAccount.userName, owner, name)
+            }
+            // call web hook
+            getWebHookURLs(owner, name) match {
+              case webHookURLs if(webHookURLs.nonEmpty) =>
+                for(ownerAccount <- getAccountByUserName(owner)){
+                  callWebHook(owner, name, webHookURLs,
+                    WebHookPayload(git, loginAccount, mergeBaseRefName, repository, commits.flatten.toList, ownerAccount))
+                }
+              case _ =>
+            }
+
+            // notifications
+            Notifier().toNotify(repository, issueId, "merge"){
+              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
+            }
+
+            redirect(s"/${owner}/${name}/pull/${issueId}")
           }
         }
       }
@@ -182,89 +228,101 @@ trait PullRequestsControllerBase extends ControllerBase {
             val oldBranch = JGitUtil.getDefaultBranch(oldGit, originRepository).get._2
             val newBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2
 
-            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
+            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${originUserName}:${oldBranch}...${newBranch}")
           }
         } getOrElse NotFound
       }
       case _ => {
         using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
           JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) =>
-            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}")
+            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}")
           } getOrElse {
-            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}")
+            redirect(s"/${forkedRepository.owner}/${forkedRepository.name}")
           }
         }
       }
     }
   })
 
-  get("/:owner/:repository/compare/*...*")(referrersOnly { repository =>
+  get("/:owner/:repository/compare/*...*")(referrersOnly { forkedRepository =>
     val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, repository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, repository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
 
-    (getRepository(originOwner, repository.name, baseUrl),
-     getRepository(forkedOwner, repository.name, baseUrl)) match {
-      case (Some(originRepository), Some(forkedRepository)) => {
-        using(
-          Git.open(getRepositoryDir(originOwner, repository.name)),
-          Git.open(getRepositoryDir(forkedOwner, repository.name))
-        ){ case (oldGit, newGit) =>
-          val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
-          val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
-
-          val forkedId = getForkedCommitId(oldGit, newGit,
-            originOwner, repository.name, originBranch,
-            forkedOwner, repository.name, forkedBranch)
-
-          val oldId = oldGit.getRepository.resolve(forkedId)
-          val newId = newGit.getRepository.resolve(forkedBranch)
-
-          val (commits, diffs) = getRequestCompareInfo(
-            originOwner, repository.name, oldId.getName,
-            forkedOwner, repository.name, newId.getName)
-
-          pulls.html.compare(
-            commits,
-            diffs,
-            repository.repository.originUserName.map { userName =>
-              userName :: getForkedRepositories(userName, repository.name)
-            } getOrElse List(repository.owner),
-            originBranch,
-            forkedBranch,
-            oldId.getName,
-            newId.getName,
-            repository,
-            originRepository,
-            forkedRepository,
-            hasWritePermission(repository.owner, repository.name, context.loginAccount))
+    (for(
+      originRepositoryName <- if(originOwner == forkedOwner){
+        Some(forkedRepository.name)
+      } else {
+        forkedRepository.repository.originRepositoryName.orElse {
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
         }
+      };
+      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+    ) yield {
+      using(
+        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+      ){ case (oldGit, newGit) =>
+        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+        val forkedId = getForkedCommitId(oldGit, newGit,
+          originRepository.owner, originRepository.name, originBranch,
+          forkedRepository.owner, forkedRepository.name, forkedBranch)
+
+        val oldId = oldGit.getRepository.resolve(forkedId)
+        val newId = newGit.getRepository.resolve(forkedBranch)
+
+        val (commits, diffs) = getRequestCompareInfo(
+          originRepository.owner, originRepository.name, oldId.getName,
+          forkedRepository.owner, forkedRepository.name, newId.getName)
+
+        pulls.html.compare(
+          commits,
+          diffs,
+          (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
+            case (Some(userName), Some(repositoryName)) => (userName, repositoryName) :: getForkedRepositories(userName, repositoryName)
+            case _ => (forkedRepository.owner, forkedRepository.name) :: getForkedRepositories(forkedRepository.owner, forkedRepository.name)
+          },
+          originBranch,
+          forkedBranch,
+          oldId.getName,
+          newId.getName,
+          forkedRepository,
+          originRepository,
+          forkedRepository,
+          hasWritePermission(forkedRepository.owner, forkedRepository.name, context.loginAccount))
       }
-      case _ => NotFound
-    }
+    }) getOrElse NotFound
   })
 
-  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { repository =>
+  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { forkedRepository =>
     val Seq(origin, forked) = multiParams("splat")
-    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, repository.owner)
-    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, repository.owner)
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, forkedRepository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, forkedRepository.owner)
 
-    (getRepository(originOwner, repository.name, baseUrl),
-      getRepository(forkedOwner, repository.name, baseUrl)) match {
-      case (Some(originRepository), Some(forkedRepository)) => {
-        using(
-          Git.open(getRepositoryDir(originOwner, repository.name)),
-          Git.open(getRepositoryDir(forkedOwner, repository.name))
-        ){ case (oldGit, newGit) =>
-          val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
-          val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
-
-          pulls.html.mergecheck(
-            checkConflict(originOwner, repository.name, originBranch, forkedOwner, repository.name, forkedBranch))
+    (for(
+      originRepositoryName <- if(originOwner == forkedOwner){
+        Some(forkedRepository.name)
+      } else {
+        forkedRepository.repository.originRepositoryName.orElse {
+          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
         }
+      };
+      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+    ) yield {
+      using(
+        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
+        Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
+      ){ case (oldGit, newGit) =>
+        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+        pulls.html.mergecheck(
+          checkConflict(originRepository.owner, originRepository.name, originBranch,
+                        forkedRepository.owner, forkedRepository.name, forkedBranch))
       }
-      case _ => NotFound()
-    }
+    }) getOrElse NotFound
   })
 
   post("/:owner/:repository/pulls/new", pullRequestForm)(referrersOnly { (form, repository) =>
@@ -286,7 +344,7 @@ trait PullRequestsControllerBase extends ControllerBase {
       issueId               = issueId,
       originBranch          = form.targetBranch,
       requestUserName       = form.requestUserName,
-      requestRepositoryName = repository.name,
+      requestRepositoryName = form.requestRepositoryName,
       requestBranch         = form.requestBranch,
       commitIdFrom          = form.commitIdFrom,
       commitIdTo            = form.commitIdTo)
@@ -294,7 +352,7 @@ trait PullRequestsControllerBase extends ControllerBase {
     // fetch requested branch
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       git.fetch
-        .setRemote(getRepositoryDir(form.requestUserName, repository.name).toURI.toString)
+        .setRemote(getRepositoryDir(form.requestUserName, form.requestRepositoryName).toURI.toString)
         .setRefSpecs(new RefSpec(s"refs/heads/${form.requestBranch}:refs/pull/${issueId}/head"))
         .call
     }
@@ -315,23 +373,52 @@ trait PullRequestsControllerBase extends ControllerBase {
    */
   private def checkConflict(userName: String, repositoryName: String, branch: String,
                             requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
-    // TODO Are there more quick way?
     LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){
-      val remote = getRepositoryDir(userName, repositoryName)
-      withTmpDir(new java.io.File(getTemporaryDir(userName, repositoryName), "merge-check")){ tmpdir =>
-        using(Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(branch).call){ git =>
-
-          git.checkout.setName(branch).call
-
+      using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
+        val remoteRefName = s"refs/heads/${branch}"
+        val tmpRefName = s"refs/merge-check/${userName}/${branch}"
+        val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
+        try {
+          // fetch objects from origin repository branch
           git.fetch
-            .setRemote(getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString)
-            .setRefSpecs(new RefSpec(s"refs/heads/${branch}:refs/heads/${requestBranch}")).call
+             .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
+             .setRefSpecs(refSpec)
+             .call
 
-          val result = git.merge
-            .include(git.getRepository.resolve("FETCH_HEAD"))
-            .setCommit(false).call
+          // merge conflict check
+          val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
+          val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${requestBranch}")
+          val mergeTip = git.getRepository.resolve(tmpRefName)
+          try {
+            !merger.merge(mergeBaseTip, mergeTip)
+          } catch {
+            case e: NoMergeBaseException =>  true
+          }
+        } finally {
+          val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
+          refUpdate.setForceUpdate(true)
+          refUpdate.delete()
+        }
+      }
+    }
+  }
 
-          result.getConflicts != null
+  /**
+   * Checks whether conflict will be caused in merging within pull request. Returns true if conflict will be caused.
+   */
+  private def checkConflictInPullRequest(userName: String, repositoryName: String, branch: String,
+                                         requestUserName: String, requestRepositoryName: String, requestBranch: String,
+                                         issueId: Int): Boolean = {
+    LockUtil.lock(s"${userName}/${repositoryName}/merge") {
+      using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
+        // merge
+        val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
+        val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${branch}")
+        val mergeTip = git.getRepository.resolve(s"refs/pull/${issueId}/head")
+        try {
+          !merger.merge(mergeBaseTip, mergeTip)
+        } catch {
+          case e: NoMergeBaseException => true
         }
       }
     }
@@ -363,8 +450,7 @@ trait PullRequestsControllerBase extends ControllerBase {
   private def getForkedCommitId(oldGit: Git, newGit: Git, userName: String, repositoryName: String, branch: String,
       requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
     JGitUtil.getCommitLogs(newGit, requestBranch, true){ commit =>
-      existsCommitId(userName, repositoryName, commit.getName) &&
-        JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
+      existsCommitId(userName, repositoryName, commit.getName) && JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
     }.head.id
 
   private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
@@ -379,7 +465,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
       val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
         new CommitInfo(revCommit)
-      }.toList.splitWith{ (commit1, commit2) =>
+      }.toList.splitWith { (commit1, commit2) =>
         view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
       }
 

src/main/scala/app/RepositorySettingsController.scala

@@ -5,7 +5,7 @@ import util.Directory._
 import util.{UsersAuthenticator, OwnerAuthenticator}
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
-import org.scalatra.FlashMapSupport
+import org.scalatra.i18n.Messages
 import service.WebHookService.WebHookPayload
 import util.JGitUtil.CommitInfo
 import util.ControlUtil._
@@ -15,17 +15,18 @@ class RepositorySettingsController extends RepositorySettingsControllerBase
   with RepositoryService with AccountService with WebHookService
   with OwnerAuthenticator with UsersAuthenticator
 
-trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport {
+trait RepositorySettingsControllerBase extends ControllerBase {
   self: RepositoryService with AccountService with WebHookService
     with OwnerAuthenticator with UsersAuthenticator =>
 
   // for repository options
-  case class OptionsForm(description: Option[String], defaultBranch: String, isPrivate: Boolean)
+  case class OptionsForm(repositoryName: String, description: Option[String], defaultBranch: String, isPrivate: Boolean)
   
   val optionsForm = mapping(
-    "description"   -> trim(label("Description"    , optional(text()))),
-    "defaultBranch" -> trim(label("Default Branch" , text(required, maxlength(100)))),
-    "isPrivate"     -> trim(label("Repository Type", boolean()))
+    "repositoryName" -> trim(label("Description"    , text(required, maxlength(40), identifier, renameRepositoryName))),
+    "description"    -> trim(label("Description"    , optional(text()))),
+    "defaultBranch"  -> trim(label("Default Branch" , text(required, maxlength(100)))),
+    "isPrivate"      -> trim(label("Repository Type", boolean()))
   )(OptionsForm.apply)
 
   // for collaborator addition
@@ -42,6 +43,13 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
     "url" -> trim(label("url", text(required, webHook)))
   )(WebHookForm.apply)
 
+  // for transfer ownership
+  case class TransferOwnerShipForm(newOwner: String)
+
+  val transferForm = mapping(
+    "newOwner" -> trim(label("New owner", text(required, transferUser)))
+  )(TransferOwnerShipForm.apply)
+
   /**
    * Redirect to the Options page.
    */
@@ -69,8 +77,21 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
         repository.repository.isPrivate
       } getOrElse form.isPrivate
     )
+    // Change repository name
+    if(repository.name != form.repositoryName){
+      // Update database
+      renameRepository(repository.owner, repository.name, repository.owner, form.repositoryName)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(repository.owner, form.repositoryName))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(repository.owner, form.repositoryName))
+      }
+    }
     flash += "info" -> "Repository settings has been updated."
-    redirect(s"/${repository.owner}/${repository.name}/settings/options")
+    redirect(s"/${repository.owner}/${form.repositoryName}/settings/options")
   })
   
   /**
@@ -137,15 +158,13 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
         .setMaxCount(3)
         .call.iterator.asScala.map(new CommitInfo(_))
 
-      val webHookURLs = getWebHookURLs(repository.owner, repository.name)
-      if(webHookURLs.nonEmpty){
-        callWebHook(repository.owner, repository.name, webHookURLs,
-          WebHookPayload(
-            git,
-            "refs/heads/" + repository.repository.defaultBranch,
-            repository,
-            commits.toList,
-            getAccountByUserName(repository.owner).get))
+      getWebHookURLs(repository.owner, repository.name) match {
+        case webHookURLs if(webHookURLs.nonEmpty) =>
+          for(ownerAccount <- getAccountByUserName(repository.owner)){
+            callWebHook(repository.owner, repository.name, webHookURLs,
+              WebHookPayload(git, ownerAccount, "refs/heads/" + repository.repository.defaultBranch, repository, commits.toList, ownerAccount))
+          }
+        case _ =>
       }
 
       flash += "info" -> "Test payload deployed!"
@@ -154,10 +173,30 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
   })
 
   /**
-   * Display the delete repository page.
+   * Display the danger zone.
    */
-  get("/:owner/:repository/settings/delete")(ownerOnly {
-    settings.html.delete(_)
+  get("/:owner/:repository/settings/danger")(ownerOnly {
+    settings.html.danger(_)
+  })
+
+  /**
+   * Transfer repository ownership.
+   */
+  post("/:owner/:repository/settings/transfer", transferForm)(ownerOnly { (form, repository) =>
+    // Change repository owner
+    if(repository.owner != form.newOwner){
+      // Update database
+      renameRepository(repository.owner, repository.name, form.newOwner, repository.name)
+      // Move git repository
+      defining(getRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getRepositoryDir(form.newOwner, repository.name))
+      }
+      // Move wiki repository
+      defining(getWikiRepositoryDir(repository.owner, repository.name)){ dir =>
+        FileUtils.moveDirectory(dir, getWikiRepositoryDir(form.newOwner, repository.name))
+      }
+    }
+    redirect(s"/${form.newOwner}/${repository.name}")
   })
 
   /**
@@ -177,7 +216,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    * Provides duplication check for web hook url.
    */
   private def webHook: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
   }
 
@@ -185,7 +224,7 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
    * Provides Constraint to validate the collaborator name.
    */
   private def collaborator: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       getAccountByUserName(value) match {
         case None => Some("User does not exist.")
         case Some(x) if(x.isGroupAccount)
@@ -196,4 +235,32 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
       }
   }
 
+  /**
+   * Duplicate check for the rename repository name.
+   */
+  private def renameRepositoryName: Constraint = new Constraint(){
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
+      params.get("repository").filter(_ != value).flatMap { _ =>
+        params.get("owner").flatMap { userName =>
+          getRepositoryNamesOfUser(userName).find(_ == value).map(_ => "Repository already exists.")
+        }
+      }
+  }
+
+  /**
+   * Provides Constraint to validate the repository transfer user.
+   */
+  private def transferUser: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      getAccountByUserName(value) match {
+        case None    => Some("User does not exist.")
+        case Some(x) => if(x.userName == params("owner")){
+          Some("This is current repository owner.")
+        } else {
+          params.get("repository").flatMap { repositoryName =>
+            getRepositoryNamesOfUser(x.userName).find(_ == repositoryName).map{ _ => "User already has same repository." }
+          }
+        }
+      }
+  }
 }

src/main/scala/app/RepositoryViewerController.scala

@@ -3,7 +3,7 @@ package app
 import util.Directory._
 import util.Implicits._
 import util.ControlUtil._
-import _root_.util.{ReferrerAuthenticator, JGitUtil, FileUtil, StringUtil}
+import _root_.util._
 import service._
 import org.scalatra._
 import java.io.File
@@ -12,15 +12,16 @@ import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
 import java.util.zip.{ZipEntry, ZipOutputStream}
+import scala.Some
 
 class RepositoryViewerController extends RepositoryViewerControllerBase 
-  with RepositoryService with AccountService with ReferrerAuthenticator
+  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 /**
  * The repository viewer.
  */
 trait RepositoryViewerControllerBase extends ControllerBase { 
-  self: RepositoryService with AccountService with ReferrerAuthenticator =>
+  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   /**
    * Returns converted HTML from Markdown for preview.
@@ -81,44 +82,45 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       @scala.annotation.tailrec
-      def getPathObjectId(path: String, walk: TreeWalk): ObjectId = walk.next match {
-        case true if(walk.getPathString == path) => walk.getObjectId(0)
-        case true => getPathObjectId(path, walk)
+      def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+        case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+        case true  => getPathObjectId(path, walk)
+        case false => None
       }
 
-      val objectId = using(new TreeWalk(git.getRepository)){ treeWalk =>
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
         treeWalk.addTree(revCommit.getTree)
         treeWalk.setRecursive(true)
         getPathObjectId(path, treeWalk)
-      }
-
-      if(raw){
-        // Download
-        defining(JGitUtil.getContent(git, objectId, false).get){ bytes =>
-          contentType = FileUtil.getContentType(path, bytes)
-          bytes
-        }
-      } else {
-        // Viewer
-        val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
-        val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
-        val bytes  = if(viewer == "other") JGitUtil.getContent(git, objectId, false) else None
-
-        val content = if(viewer == "other"){
-          if(bytes.isDefined && FileUtil.isText(bytes.get)){
-            // text
-            JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
-          } else {
-            // binary
-            JGitUtil.ContentInfo("binary", None)
+      } map { objectId =>
+        if(raw){
+          // Download
+          defining(JGitUtil.getContentFromId(git, objectId, false).get){ bytes =>
+            contentType = FileUtil.getContentType(path, bytes)
+            bytes
           }
         } else {
-          // image or large
-          JGitUtil.ContentInfo(viewer, None)
-        }
+          // Viewer
+          val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
+          val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
+          val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
 
-        repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
-      }
+          val content = if(viewer == "other"){
+            if(bytes.isDefined && FileUtil.isText(bytes.get)){
+              // text
+              JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
+            } else {
+              // binary
+              JGitUtil.ContentInfo("binary", None)
+            }
+          } else {
+            // image or large
+            JGitUtil.ContentInfo(viewer, None)
+          }
+
+          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
+        }
+      } getOrElse NotFound
     }
   })
 
@@ -150,10 +152,25 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
         (branchName, revCommit.getCommitterIdent.getWhen)
       }
-      repo.html.branches(branchInfo, repository)
+      repo.html.branches(branchInfo, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
     }
   })
 
+  /**
+   * Deletes branch.
+   */
+  get("/:owner/:repository/delete/*")(collaboratorsOnly { repository =>
+    val branchName = multiParams("splat").head
+    val userName   = context.loginAccount.get.userName
+    if(repository.repository.defaultBranch != branchName){
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        git.branchDelete().setBranchNames(branchName).call()
+        recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
+      }
+    }
+    redirect(s"/${repository.owner}/${repository.name}/branches")
+  })
+
   /**
    * Displays tags.
    */
@@ -164,8 +181,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   /**
    * Download repository contents as an archive.
    */
-  get("/:owner/:repository/archive/:name")(referrersOnly { repository =>
-    val name = params("name")
+  get("/:owner/:repository/archive/*")(referrersOnly { repository =>
+    val name = multiParams("splat").head
 
     if(name.endsWith(".zip")){
       val revision = name.replaceFirst("\\.zip$", "")
@@ -175,7 +192,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       }
       workDir.mkdirs
 
-      val zipFile = new File(workDir, (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")
+      val zipFile = new File(workDir, repository.name + "-" +
+        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")
 
       using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
         val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
@@ -190,7 +208,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
             while(walk.next){
               val name = walk.getPathString
               val mode = walk.getFileMode(0)
-              if(mode != FileMode.TREE){
+              if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
                 walk.getObjectId(objectId, 0)
                 val entry = new ZipEntry(name)
                 val loader = reader.open(objectId)
@@ -204,6 +222,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       }
 
       contentType = "application/octet-stream"
+      response.setHeader("Content-Disposition", s"attachment; filename=${zipFile.getName}")
       zipFile
     } else {
       BadRequest
@@ -232,6 +251,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     (id, path.substring(id.length).replaceFirst("^/", ""))
   }
 
+
+  private val readmeFiles = Seq("readme.md", "readme.markdown")
+
   /**
    * Provides HTML of the file list.
    * 
@@ -245,15 +267,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       repo.html.guide(repository)
     } else {
       using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
+        //val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
         // get specified commit
         JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
           defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit =>
           // get files
             val files = JGitUtil.getFileList(git, revision, path)
-            // process README.md
-            val readme = files.find(_.name == "README.md").map { file =>
-              StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
+            // process README.md or README.markdown
+            val readme = files.find { file =>
+              readmeFiles.contains(file.name.toLowerCase)
+            }.map { file =>
+              file -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
+                Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
             }
 
             repo.html.files(revision, repository,

src/main/scala/app/SearchController.scala

@@ -6,13 +6,10 @@ import service._
 import jp.sf.amateras.scalatra.forms._
 
 class SearchController extends SearchControllerBase
-with RepositoryService with AccountService with SystemSettingsService with ActivityService
-with RepositorySearchService with IssuesService
-with ReferrerAuthenticator
+  with RepositoryService with AccountService with ActivityService with RepositorySearchService with IssuesService with ReferrerAuthenticator
 
 trait SearchControllerBase extends ControllerBase { self: RepositoryService
-  with SystemSettingsService with ActivityService with RepositorySearchService
-  with ReferrerAuthenticator =>
+  with ActivityService with RepositorySearchService with ReferrerAuthenticator =>
 
   val searchForm = mapping(
     "query"      -> trim(text(required)),

src/main/scala/app/SignInController.scala

@@ -1,58 +0,0 @@
-package app
-
-import service._
-import jp.sf.amateras.scalatra.forms._
-import util.Implicits._
-import util.StringUtil._
-import util.Keys
-
-class SignInController extends SignInControllerBase with SystemSettingsService with AccountService
-
-trait SignInControllerBase extends ControllerBase { self: SystemSettingsService with AccountService =>
-  
-  case class SignInForm(userName: String, password: String)
-  
-  val form = mapping(
-    "userName" -> trim(label("Username", text(required))),
-    "password" -> trim(label("Password", text(required)))
-  )(SignInForm.apply)
-  
-  get("/signin"){
-    val redirect = params.get("redirect")
-    if(redirect.isDefined && redirect.get.startsWith("/")){
-      session.setAttribute(Keys.Session.Redirect, redirect.get)
-    }
-    html.signin(loadSystemSettings())
-  }
-
-  post("/signin", form){ form =>
-    authenticate(loadSystemSettings(), form.userName, form.password) match {
-      case Some(account) => signin(account)
-      case None          => redirect("/signin")
-    }
-  }
-
-  get("/signout"){
-    session.invalidate
-    redirect("/")
-  }
-
-  /**
-   * Set account information into HttpSession and redirect.
-   */
-  private def signin(account: model.Account) = {
-    session.setAttribute(Keys.Session.LoginAccount, account)
-    updateLastLoginDate(account.userName)
-
-    session.getAndRemove[String](Keys.Session.Redirect).map { redirectUrl =>
-      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
-        redirect("/")
-      } else {
-        redirect(urlEncode(redirectUrl).replaceAll("%2F", "/"))
-      }
-    }.getOrElse {
-      redirect("/")
-    }
-  }
-
-}

src/main/scala/app/SystemSettingsController.scala

@@ -4,18 +4,21 @@ import service.{AccountService, SystemSettingsService}
 import SystemSettingsService._
 import util.AdminAuthenticator
 import jp.sf.amateras.scalatra.forms._
-import org.scalatra.FlashMapSupport
+import ssh.SshServer
 
 class SystemSettingsController extends SystemSettingsControllerBase
-  with SystemSettingsService with AccountService with AdminAuthenticator
+  with AccountService with AdminAuthenticator
 
-trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
-  self: SystemSettingsService with AccountService with AdminAuthenticator =>
+trait SystemSettingsControllerBase extends ControllerBase {
+  self: AccountService with AdminAuthenticator =>
 
   private val form = mapping(
+    "baseUrl"                  -> trim(label("Base URL", optional(text()))),
     "allowAccountRegistration" -> trim(label("Account registration", boolean())),
     "gravatar"                 -> trim(label("Gravatar", boolean())),
     "notification"             -> trim(label("Notification", boolean())),
+    "ssh"                      -> trim(label("SSH access", boolean())),
+    "sshPort"                  -> trim(label("SSH port", optional(number()))),
     "smtp"                     -> optionalIfNotChecked("notification", mapping(
         "host"                     -> trim(label("SMTP Host", text(required))),
         "port"                     -> trim(label("SMTP Port", optional(number()))),
@@ -33,17 +36,33 @@ trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
         "bindPassword"             -> trim(label("Bind Password", optional(text()))),
         "baseDN"                   -> trim(label("Base DN", text(required))),
         "userNameAttribute"        -> trim(label("User name attribute", text(required))),
-        "mailAttribute"            -> trim(label("Mail address attribute", text(required)))
+        "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
+        "mailAttribute"            -> trim(label("Mail address attribute", text(required))),
+        "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
+        "keystore"                 -> trim(label("Keystore", optional(text())))
     )(Ldap.apply))
-  )(SystemSettings.apply)
+  )(SystemSettings.apply).verifying { settings =>
+    if(settings.ssh && settings.baseUrl.isEmpty){
+      Seq("baseUrl" -> "Base URL is required if SSH access is enabled.")
+    } else Nil
+  }
 
 
   get("/admin/system")(adminOnly {
-    admin.html.system(loadSystemSettings(), flash.get("info"))
+    admin.html.system(flash.get("info"))
   })
 
   post("/admin/system", form)(adminOnly { form =>
     saveSystemSettings(form)
+
+    if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
+      SshServer.start(request.getServletContext,
+        form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
+        form.baseUrl.get)
+    } else if(!form.ssh && SshServer.isActive){
+      SshServer.stop()
+    }
+
     flash += "info" -> "System settings has been updated."
     redirect("/admin/system")
   })

src/main/scala/app/UserManagementController.scala

@@ -5,6 +5,9 @@ import util.AdminAuthenticator
 import util.StringUtil._
 import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
+import org.scalatra.i18n.Messages
+import org.apache.commons.io.FileUtils
+import util.Directory._
 
 class UserManagementController extends UserManagementControllerBase
   with AccountService with RepositoryService with AdminAuthenticator
@@ -17,57 +20,61 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
                          url: Option[String], fileId: Option[String])
 
   case class EditUserForm(userName: String, password: Option[String], fullName: String,
-                          mailAddress: String, isAdmin: Boolean,
-                          url: Option[String], fileId: Option[String], clearImage: Boolean)
+                          mailAddress: String, isAdmin: Boolean, url: Option[String],
+                          fileId: Option[String], clearImage: Boolean, isRemoved: Boolean)
 
   case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                          memberNames: Option[String])
+                          members: String)
 
   case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                           memberNames: Option[String], clearImage: Boolean)
+                           members: String, clearImage: Boolean, isRemoved: Boolean)
 
   val newUserForm = mapping(
-    "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier, uniqueUserName))),
-    "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
-    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
-    "isAdmin"     -> trim(label("User Type"    , boolean())),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"      , optional(text())))
+    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier, uniqueUserName))),
+    "password"    -> trim(label("Password"     ,text(required, maxlength(20)))),
+    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
+    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress()))),
+    "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      ,optional(text())))
   )(NewUserForm.apply)
 
   val editUserForm = mapping(
-    "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier))),
-    "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
-    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
-    "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
-    "isAdmin"     -> trim(label("User Type"    , boolean())),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
-    "clearImage"  -> trim(label("Clear image"  , boolean()))
+    "userName"    -> trim(label("Username"     ,text(required, maxlength(100), identifier))),
+    "password"    -> trim(label("Password"     ,optional(text(maxlength(20))))),
+    "fullName"    -> trim(label("Full Name"    ,text(required, maxlength(100)))),
+    "mailAddress" -> trim(label("Mail Address" ,text(required, maxlength(100), uniqueMailAddress("userName")))),
+    "isAdmin"     -> trim(label("User Type"    ,boolean())),
+    "url"         -> trim(label("URL"          ,optional(text(maxlength(200))))),
+    "fileId"      -> trim(label("File ID"      ,optional(text()))),
+    "clearImage"  -> trim(label("Clear image"  ,boolean())),
+    "removed"     -> trim(label("Disable"      ,boolean()))
   )(EditUserForm.apply)
 
   val newGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier, uniqueUserName))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
-    "memberNames" -> trim(label("Member Names" , optional(text())))
+    "groupName" -> trim(label("Group name" ,text(required, maxlength(100), identifier, uniqueUserName))),
+    "url"       -> trim(label("URL"        ,optional(text(maxlength(200))))),
+    "fileId"    -> trim(label("File ID"    ,optional(text()))),
+    "members"   -> trim(label("Members"    ,text(required, members)))
   )(NewGroupForm.apply)
 
   val editGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier))),
-    "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
-    "fileId"      -> trim(label("File ID"      , optional(text()))),
-    "memberNames" -> trim(label("Member Names" , optional(text()))),
-    "clearImage"  -> trim(label("Clear image"  , boolean()))
+    "groupName"  -> trim(label("Group name"  ,text(required, maxlength(100), identifier))),
+    "url"        -> trim(label("URL"         ,optional(text(maxlength(200))))),
+    "fileId"     -> trim(label("File ID"     ,optional(text()))),
+    "members"    -> trim(label("Members"     ,text(required, members))),
+    "clearImage" -> trim(label("Clear image" ,boolean())),
+    "removed"    -> trim(label("Disable"     ,boolean()))
   )(EditGroupForm.apply)
 
   get("/admin/users")(adminOnly {
-    val users = getAllUsers()
-    val members = users.collect { case account if(account.isGroupAccount) =>
-      account.userName -> getGroupMembers(account.userName)
+    val includeRemoved = params.get("includeRemoved").map(_.toBoolean).getOrElse(false)
+    val users          = getAllUsers(includeRemoved)
+    val members        = users.collect { case account if(account.isGroupAccount) =>
+      account.userName -> getGroupMembers(account.userName).map(_.userName)
     }.toMap
-    admin.users.html.list(users, members)
+
+    admin.users.html.list(users, members, includeRemoved)
   })
   
   get("/admin/users/_newuser")(adminOnly {
@@ -82,18 +89,32 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   
   get("/admin/users/:userName/_edituser")(adminOnly {
     val userName = params("userName")
-    admin.users.html.user(getAccountByUserName(userName))
+    admin.users.html.user(getAccountByUserName(userName, true))
   })
   
   post("/admin/users/:name/_edituser", editUserForm)(adminOnly { form =>
     val userName = params("userName")
-    getAccountByUserName(userName).map { account =>
-      updateAccount(getAccountByUserName(userName).get.copy(
+    getAccountByUserName(userName, true).map { account =>
+
+      if(form.isRemoved){
+        // Remove repositories
+        getRepositoryNamesOfUser(userName).foreach { repositoryName =>
+          deleteRepository(userName, repositoryName)
+          FileUtils.deleteDirectory(getRepositoryDir(userName, repositoryName))
+          FileUtils.deleteDirectory(getWikiRepositoryDir(userName, repositoryName))
+          FileUtils.deleteDirectory(getTemporaryDir(userName, repositoryName))
+        }
+        // Remove from GROUP_MEMBER, COLLABORATOR and REPOSITORY
+        removeUserRelatedData(userName)
+      }
+
+      updateAccount(account.copy(
         password     = form.password.map(sha1).getOrElse(account.password),
         fullName     = form.fullName,
         mailAddress  = form.mailAddress,
         isAdmin      = form.isAdmin,
-        url          = form.url))
+        url          = form.url,
+        isRemoved    = form.isRemoved))
 
       updateImage(userName, form.fileId, form.clearImage)
       redirect("/admin/users")
@@ -107,27 +128,49 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
 
   post("/admin/users/_newgroup", newGroupForm)(adminOnly { form =>
     createGroup(form.groupName, form.url)
-    updateGroupMembers(form.groupName, form.memberNames.map(_.split(",").toList).getOrElse(Nil))
+    updateGroupMembers(form.groupName, form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList)
     updateImage(form.groupName, form.fileId, false)
     redirect("/admin/users")
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
     defining(params("groupName")){ groupName =>
-      admin.users.html.group(getAccountByUserName(groupName), getGroupMembers(groupName))
+      admin.users.html.group(getAccountByUserName(groupName, true), getGroupMembers(groupName))
     }
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    defining(params("groupName"), form.memberNames.map(_.split(",").toList).getOrElse(Nil)){ case (groupName, memberNames) =>
-      getAccountByUserName(groupName).map { account =>
-        updateGroup(groupName, form.url)
-        updateGroupMembers(form.groupName, memberNames)
+    defining(params("groupName"), form.members.split(",").map {
+      _.split(":") match {
+        case Array(userName, isManager) => (userName, isManager.toBoolean)
+      }
+    }.toList){ case (groupName, members) =>
+      getAccountByUserName(groupName, true).map { account =>
+        updateGroup(groupName, form.url, form.isRemoved)
 
-        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-          removeCollaborators(form.groupName, repositoryName)
-          memberNames.foreach { userName =>
-            addCollaborator(form.groupName, repositoryName, userName)
+        if(form.isRemoved){
+          // Remove from GROUP_MEMBER
+          updateGroupMembers(form.groupName, Nil)
+          // Remove repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            deleteRepository(groupName, repositoryName)
+            FileUtils.deleteDirectory(getRepositoryDir(groupName, repositoryName))
+            FileUtils.deleteDirectory(getWikiRepositoryDir(groupName, repositoryName))
+            FileUtils.deleteDirectory(getTemporaryDir(groupName, repositoryName))
+          }
+        } else {
+          // Update GROUP_MEMBER
+          updateGroupMembers(form.groupName, members)
+          // Update COLLABORATOR for group repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            removeCollaborators(form.groupName, repositoryName)
+            members.foreach { case (userName, isManager) =>
+              addCollaborator(form.groupName, repositoryName, userName)
+            }
           }
         }
 
@@ -138,8 +181,17 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
     }
   })
 
-  post("/admin/users/_usercheck")(adminOnly {
+  // TODO Move to other generic controller?
+  post("/admin/users/_usercheck"){
     getAccountByUserName(params("userName")).isDefined
-  })
+  }
+
+  private def members: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      if(value.split(",").exists {
+        _.split(":") match { case Array(userName, isManager) => isManager.toBoolean }
+      }) None else Some("Must select one manager at least.")
+    }
+  }
 
 }

src/main/scala/app/WikiController.scala

@@ -6,17 +6,15 @@ import util.Directory._
 import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
-import org.scalatra.FlashMapSupport
-import service.WikiService.WikiPageInfo
+import org.scalatra.i18n.Messages
 import scala.Some
+import java.util.ResourceBundle
 
 class WikiController extends WikiControllerBase 
-  with WikiService with RepositoryService with AccountService with ActivityService
-  with CollaboratorsAuthenticator with ReferrerAuthenticator
+  with WikiService with RepositoryService with AccountService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator
 
-trait WikiControllerBase extends ControllerBase with FlashMapSupport {
-  self: WikiService with RepositoryService with ActivityService
-    with CollaboratorsAuthenticator with ReferrerAuthenticator =>
+trait WikiControllerBase extends ControllerBase {
+  self: WikiService with RepositoryService with ActivityService with CollaboratorsAuthenticator with ReferrerAuthenticator =>
 
   case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
   
@@ -66,7 +64,7 @@ trait WikiControllerBase extends ControllerBase with FlashMapSupport {
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      wiki.html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true), repository,
+      wiki.html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true).filter(_.newPath == pageName + ".md"), repository,
         hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
     }
   })
@@ -96,7 +94,7 @@ trait WikiControllerBase extends ControllerBase with FlashMapSupport {
     val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
     if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)){
-      redirect(s"/${repository.owner}/${repository.name}/wiki/}")
+      redirect(s"/${repository.owner}/${repository.name}/wiki/")
     } else {
       flash += "info" -> "This patch was not able to be reversed."
       redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
@@ -170,12 +168,12 @@ trait WikiControllerBase extends ControllerBase with FlashMapSupport {
   })
 
   private def unique: Constraint = new Constraint(){
-    override def validate(name: String, value: String, params: Map[String, String]): Option[String] =
+    override def validate(name: String, value: String, params: Map[String, String], messages: Messages): Option[String] =
       getWikiPageList(params("owner"), params("repository")).find(_ == value).map(_ => "Page already exists.")
   }
 
   private def pagename: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       if(value.exists("\\/:*?\"<>|".contains(_))){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
@@ -186,17 +184,17 @@ trait WikiControllerBase extends ControllerBase with FlashMapSupport {
   }
 
   private def conflictForNew: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] = {
-      optionIf(targetWikiPage.nonEmpty){
-        Some("Someone has created the wiki since you started. Please reload this page and re-apply your changes.")
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      targetWikiPage.map { _ =>
+        "Someone has created the wiki since you started. Please reload this page and re-apply your changes."
       }
     }
   }
 
   private def conflictForEdit: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] = {
-      optionIf(targetWikiPage.map(_.id != params("id")).getOrElse(true)){
-        Some("Someone has edited the wiki since you started. Please reload this page and re-apply your changes.")
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      targetWikiPage.filter(_.id != params("id")).map{ _ =>
+        "Someone has edited the wiki since you started. Please reload this page and re-apply your changes."
       }
     }
   }

src/main/scala/model/Account.scala

@@ -14,7 +14,8 @@ object Accounts extends Table[Account]("ACCOUNT") {
   def lastLoginDate = column[java.util.Date]("LAST_LOGIN_DATE")
   def image = column[String]("IMAGE")
   def groupAccount = column[Boolean]("GROUP_ACCOUNT")
-  def * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount <> (Account, Account.unapply _)
+  def removed = column[Boolean]("REMOVED")
+  def * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount ~ removed <> (Account, Account.unapply _)
 }
 
 case class Account(
@@ -28,5 +29,6 @@ case class Account(
     updatedDate: java.util.Date,
     lastLoginDate: Option[java.util.Date],
     image: Option[String],
-    isGroupAccount: Boolean
+    isGroupAccount: Boolean,
+    isRemoved: Boolean
 )

src/main/scala/model/GroupMembers.scala

@@ -5,10 +5,12 @@ import scala.slick.driver.H2Driver.simple._
 object GroupMembers extends Table[GroupMember]("GROUP_MEMBER") {
   def groupName = column[String]("GROUP_NAME", O PrimaryKey)
   def userName = column[String]("USER_NAME", O PrimaryKey)
-  def * = groupName ~ userName <> (GroupMember, GroupMember.unapply _)
+  def isManager = column[Boolean]("MANAGER")
+  def * = groupName ~ userName ~ isManager <> (GroupMember, GroupMember.unapply _)
 }
 
 case class GroupMember(
   groupName: String,
-  userName: String
+  userName: String,
+  isManager: Boolean
 )

src/main/scala/model/SshKey.scala

@@ -0,0 +1,22 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object SshKeys extends Table[SshKey]("SSH_KEY") {
+  def userName = column[String]("USER_NAME")
+  def sshKeyId = column[Int]("SSH_KEY_ID", O AutoInc)
+  def title = column[String]("TITLE")
+  def publicKey = column[String]("PUBLIC_KEY")
+
+  def ins = userName ~ title ~ publicKey returning sshKeyId
+  def * = userName ~ sshKeyId ~ title ~ publicKey <> (SshKey, SshKey.unapply _)
+
+  def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
+}
+
+case class SshKey(
+  userName: String,
+  sshKeyId: Int,
+  title: String,
+  publicKey: String
+)

src/main/scala/service/AccountService.scala

@@ -36,11 +36,15 @@ trait AccountService {
    */
   private def ldapAuthentication(settings: SystemSettings, userName: String, password: String) = {
     LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
-      case Right(mailAddress) => {
+      case Right(ldapUserInfo) => {
         // Create or update account by LDAP information
-        getAccountByUserName(userName) match {
-          case Some(x) => updateAccount(x.copy(mailAddress = mailAddress))
-          case None    => createAccount(userName, "", userName, mailAddress, false, None)
+        getAccountByUserName(userName, true) match {
+          case Some(x) if(!x.isRemoved) => updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+          case Some(x) if(x.isRemoved)  => {
+            logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+            defaultAuthentication(userName, password)
+          }
+          case None => createAccount(userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
         }
         getAccountByUserName(userName)
       }
@@ -51,13 +55,18 @@ trait AccountService {
     }
   }
 
-  def getAccountByUserName(userName: String): Option[Account] = 
-    Query(Accounts) filter(_.userName is userName.bind) firstOption
+  def getAccountByUserName(userName: String, includeRemoved: Boolean = false): Option[Account] =
+    Query(Accounts) filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
 
-  def getAccountByMailAddress(mailAddress: String): Option[Account] =
-    Query(Accounts) filter(_.mailAddress is mailAddress.bind) firstOption
+  def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false): Option[Account] =
+    Query(Accounts) filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
 
-  def getAllUsers(): List[Account] = Query(Accounts) sortBy(_.userName) list
+  def getAllUsers(includeRemoved: Boolean = true): List[Account] =
+    if(includeRemoved){
+      Query(Accounts) sortBy(_.userName) list
+    } else {
+      Query(Accounts) filter (_.removed is false.bind) sortBy(_.userName) list
+    }
     
   def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
     Accounts insert Account(
@@ -71,12 +80,13 @@ trait AccountService {
       updatedDate    = currentDate,
       lastLoginDate  = None,
       image          = None,
-      isGroupAccount = false)
+      isGroupAccount = false,
+      isRemoved      = false)
 
   def updateAccount(account: Account): Unit = 
     Accounts
       .filter { a => a.userName is account.userName.bind }
-      .map    { a => a.password ~ a.fullName ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? }
+      .map    { a => a.password ~ a.fullName ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? ~ a.removed }
       .update (
         account.password, 
         account.fullName, 
@@ -85,7 +95,8 @@ trait AccountService {
         account.url,
         account.registeredDate,
         currentDate,
-        account.lastLoginDate)
+        account.lastLoginDate,
+        account.isRemoved)
 
   def updateAvatarImage(userName: String, image: Option[String]): Unit =
     Accounts.filter(_.userName is userName.bind).map(_.image.?).update(image)
@@ -105,23 +116,23 @@ trait AccountService {
       updatedDate    = currentDate,
       lastLoginDate  = None,
       image          = None,
-      isGroupAccount = true)
+      isGroupAccount = true,
+      isRemoved      = false)
 
-  def updateGroup(groupName: String, url: Option[String]): Unit =
-    Accounts.filter(_.userName is groupName.bind).map(_.url.?).update(url)
+  def updateGroup(groupName: String, url: Option[String], removed: Boolean): Unit =
+    Accounts.filter(_.userName is groupName.bind).map(t => t.url.? ~ t.removed).update(url, removed)
 
-  def updateGroupMembers(groupName: String, members: List[String]): Unit = {
+  def updateGroupMembers(groupName: String, members: List[(String, Boolean)]): Unit = {
     Query(GroupMembers).filter(_.groupName is groupName.bind).delete
-    members.foreach { userName =>
-      GroupMembers insert GroupMember (groupName, userName)
+    members.foreach { case (userName, isManager) =>
+      GroupMembers insert GroupMember (groupName, userName, isManager)
     }
   }
 
-  def getGroupMembers(groupName: String): List[String] =
+  def getGroupMembers(groupName: String): List[GroupMember] =
     Query(GroupMembers)
       .filter(_.groupName is groupName.bind)
       .sortBy(_.userName)
-      .map(_.userName)
       .list
 
   def getGroupsByUserName(userName: String): List[String] =
@@ -131,6 +142,12 @@ trait AccountService {
       .map(_.groupName)
       .list
 
+  def removeUserRelatedData(userName: String): Unit = {
+    Query(GroupMembers).filter(_.userName is userName.bind).delete
+    Query(Collaborators).filter(_.collaboratorName is userName.bind).delete
+    Query(Repositories).filter(_.userName is userName.bind).delete
+  }
+
 }
 
-object AccountService extends AccountService
+object AccountService extends AccountService

src/main/scala/service/IssuesService.scala

@@ -119,16 +119,10 @@ trait IssuesService {
     // get issues and comment count and labels
     searchIssueQuery(repos, condition, filterUser, onlyPullRequest)
         .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
-        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
-        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
-        .map { case (((t1, t2), t3), t4) =>
-          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
-        }
-        .sortBy(_._4)	// labelName
-        .sortBy { case (t1, commentCount, _,_,_) =>
+        .sortBy { case (t1, t2) =>
           (condition.sort match {
             case "created"  => t1.registeredDate
-            case "comments" => commentCount
+            case "comments" => t2.commentCount
             case "updated"  => t1.updatedDate
           }) match {
             case sort => condition.direction match {
@@ -138,6 +132,11 @@ trait IssuesService {
           }
         }
         .drop(offset).take(limit)
+        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
+        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
+        .map { case (((t1, t2), t3), t4) =>
+          (t1, t2.commentCount, t4.labelId.?, t4.labelName.?, t4.color.?)
+        }
         .list
         .splitWith { (c1, c2) =>
           c1._1.userName == c2._1.userName &&
@@ -314,6 +313,14 @@ trait IssuesService {
     }.toList
   }
 
+  def closeIssuesFromMessage(message: String, userName: String, owner: String, repository: String) = {
+    extractCloseId(message).foreach { issueId =>
+      for(issue <- getIssue(owner, repository, issueId) if !issue.closed){
+        createComment(owner, repository, userName, issue.issueId, "Close", "close")
+        updateClosed(owner, repository, issue.issueId, true)
+      }
+    }
+  }
 }
 
 object IssuesService {
@@ -331,7 +338,7 @@ object IssuesService {
 
     def toURL: String =
       "?" + List(
-        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))),
+        if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))),
         milestoneId.map { id => "milestone=" + (id match {
           case Some(x) => x.toString
           case None    => "none"
@@ -352,7 +359,7 @@ object IssuesService {
 
     def apply(request: HttpServletRequest): IssueSearchCondition =
       IssueSearchCondition(
-        param(request, "labels").map(_.split(" ").toSet).getOrElse(Set.empty),
+        param(request, "labels").map(_.split(",").toSet).getOrElse(Set.empty),
         param(request, "milestone").map{
           case "none" => None
           case x      => x.toIntOpt

src/main/scala/service/PullRequestService.scala

@@ -15,6 +15,9 @@ trait PullRequestService { self: IssuesService =>
       }
     }
 
+  def updateCommitIdTo(owner: String, repository: String, issueId: Int, commitIdTo: String): Unit =
+    Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).map(_.commitIdTo).update(commitIdTo)
+
   def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
     Query(PullRequests)
       .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
@@ -43,6 +46,18 @@ trait PullRequestService { self: IssuesService =>
       commitIdFrom,
       commitIdTo))
 
+  def getPullRequestsByRequest(userName: String, repositoryName: String, branch: String, closed: Boolean): List[PullRequest] =
+    Query(PullRequests)
+      .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
+      .filter { case (t1, t2) =>
+        (t1.requestUserName       is userName.bind) &&
+        (t1.requestRepositoryName is repositoryName.bind) &&
+        (t1.requestBranch         is branch.bind) &&
+        (t2.closed                is closed.bind)
+      }
+      .map { case (t1, t2) => t1 }
+      .list
+
 }
 
 object PullRequestService {

src/main/scala/service/RepositorySearchService.scala

@@ -63,8 +63,9 @@ RepositorySearchService { self: IssuesService =>
     val list = new ListBuffer[(String, String)]
 
     while (treeWalk.next()) {
-      if(treeWalk.getFileMode(0) != FileMode.TREE){
-        JGitUtil.getContent(git, treeWalk.getObjectId(0), false).foreach { bytes =>
+      val mode = treeWalk.getFileMode(0)
+      if(mode == FileMode.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
+        JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).foreach { bytes =>
           if(FileUtil.isText(bytes)){
             val text      = StringUtil.convertFromByteArray(bytes)
             val lowerText = text.toLowerCase

src/main/scala/service/RepositoryService.scala

@@ -39,6 +39,67 @@ trait RepositoryService { self: AccountService =>
     IssueId insert (userName, repositoryName, 0)
   }
 
+  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = {
+    (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
+      Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
+
+      val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val commitLog     = Query(CommitLog    ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+      val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+
+      Repositories.filter { t =>
+        (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
+      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+
+      Repositories.filter { t =>
+        (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
+      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+
+      PullRequests.filter { t =>
+        t.requestRepositoryName is oldRepositoryName.bind
+      }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)
+
+      deleteRepository(oldUserName, oldRepositoryName)
+
+      WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+      Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      Collaborators .insertAll(collaborators .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+      CommitLog     .insertAll(commitLog     .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+      Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+
+      // Update activity messages
+      val updateActivities = Activities.filter { t =>
+        (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
+        (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
+      }.map { t => t.activityId ~ t.message }.list
+
+      updateActivities.foreach { case (activityId, message) =>
+        Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+          message
+            .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
+            .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
+            .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
+            .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
+            .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
+        )
+      }
+    }
+  }
+
   def deleteRepository(userName: String, repositoryName: String): Unit = {
     Activities    .filter(_.byRepository(userName, repositoryName)).delete
     CommitLog     .filter(_.byRepository(userName, repositoryName)).delete
@@ -46,8 +107,8 @@ trait RepositoryService { self: AccountService =>
     IssueLabels   .filter(_.byRepository(userName, repositoryName)).delete
     Labels        .filter(_.byRepository(userName, repositoryName)).delete
     IssueComments .filter(_.byRepository(userName, repositoryName)).delete
-    Issues        .filter(_.byRepository(userName, repositoryName)).delete
     PullRequests  .filter(_.byRepository(userName, repositoryName)).delete
+    Issues        .filter(_.byRepository(userName, repositoryName)).delete
     IssueId       .filter(_.byRepository(userName, repositoryName)).delete
     Milestones    .filter(_.byRepository(userName, repositoryName)).delete
     WebHooks      .filter(_.byRepository(userName, repositoryName)).delete
@@ -86,7 +147,8 @@ trait RepositoryService { self: AccountService =>
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
@@ -101,7 +163,8 @@ trait RepositoryService { self: AccountService =>
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
@@ -120,7 +183,7 @@ trait RepositoryService { self: AccountService =>
       case Some(x) if(x.isAdmin) => Query(Repositories)
       // for Normal Users
       case Some(x) if(!x.isAdmin) =>
-        Query(Repositories) filter { t => (t.isPrivate is false.bind) ||
+        Query(Repositories) filter { t => (t.isPrivate is false.bind) || (t.userName is x.userName) ||
           (Query(Collaborators).filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)} exists)
         }
       // for Guests
@@ -134,10 +197,18 @@ trait RepositoryService { self: AccountService =>
         getForkedCount(
           repository.originUserName.getOrElse(repository.userName),
           repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
+        ),
+        getRepositoryManagers(repository.userName))
     }
   }
 
+  private def getRepositoryManagers(userName: String): Seq[String] =
+    if(getAccountByUserName(userName).exists(_.isGroupAccount)){
+      getGroupMembers(userName).collect { case x if(x.isManager) => x.userName }
+    } else {
+      Seq(userName)
+    }
+
   /**
    * Updates the last activity date of the repository.
    */
@@ -207,31 +278,35 @@ trait RepositoryService { self: AccountService =>
     }.length).first
 
 
-  def getForkedRepositories(userName: String, repositoryName: String): List[String] =
+  def getForkedRepositories(userName: String, repositoryName: String): List[(String, String)] =
     Query(Repositories).filter { t =>
       (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
     }
-    .sortBy(_.userName asc).map(_.userName).list
+    .sortBy(_.userName asc).map(t => t.userName ~ t.repositoryName).list
 
 }
 
 object RepositoryService {
 
-  case class RepositoryInfo(owner: String, name: String, url: String, repository: Repository,
+  case class RepositoryInfo(owner: String, name: String, httpUrl: String, repository: Repository,
     issueCount: Int, pullCount: Int, commitCount: Int, forkedCount: Int,
-    branchList: List[String], tags: List[util.JGitUtil.TagInfo]){
+    branchList: Seq[String], tags: Seq[util.JGitUtil.TagInfo], managers: Seq[String]){
+
+    lazy val host = """^https?://(.+?)(:\d+)?/""".r.findFirstMatchIn(httpUrl).get.group(1)
+
+    def sshUrl(port: Int, userName: String) = s"ssh://${userName}@${host}:${port}/${owner}/${name}.git"
 
     /**
      * Creates instance with issue count and pull request count.
      */
-    def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int) =
-      this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags)
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, issueCount: Int, pullCount: Int, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, issueCount, pullCount, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
 
     /**
      * Creates instance without issue count and pull request count.
      */
-    def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int) =
-      this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags)
+    def this(repo: JGitUtil.RepositoryInfo, model: Repository, forkedCount: Int, managers: Seq[String]) =
+      this(repo.owner, repo.name, repo.url, model, 0, 0, repo.commitCount, forkedCount, repo.branchList, repo.tags, managers)
   }
 
   case class RepositoryTreeNode(owner: String, name: String, children: List[RepositoryTreeNode])

src/main/scala/service/RequestCache.scala

@@ -1,7 +1,6 @@
 package service
 
 import model._
-import service.SystemSettingsService.SystemSettings
 
 /**
  * This service is used for a view helper mainly.
@@ -9,28 +8,23 @@ import service.SystemSettingsService.SystemSettings
  * It may be called many times in one request, so each method stores
  * its result into the cache which available during a request.
  */
-trait RequestCache {
-
-  def getSystemSettings()(implicit context: app.Context): SystemSettings =
-    context.cache("system_settings"){
-      new SystemSettingsService {}.loadSystemSettings()
-    }
+trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
 
   def getIssue(userName: String, repositoryName: String, issueId: String)(implicit context: app.Context): Option[Issue] = {
     context.cache(s"issue.${userName}/${repositoryName}#${issueId}"){
-      new IssuesService {}.getIssue(userName, repositoryName, issueId)
+      super.getIssue(userName, repositoryName, issueId)
     }
   }
 
   def getAccountByUserName(userName: String)(implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${userName}"){
-      new AccountService {}.getAccountByUserName(userName)
+      super.getAccountByUserName(userName)
     }
   }
 
   def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
     context.cache(s"account.${mailAddress}"){
-      new AccountService {}.getAccountByMailAddress(mailAddress)
+      super.getAccountByMailAddress(mailAddress)
     }
   }
 }

src/main/scala/service/SshKeyService.scala

@@ -0,0 +1,19 @@
+package service
+
+import model._
+import scala.slick.driver.H2Driver.simple._
+import Database.threadLocalSession
+
+trait SshKeyService {
+
+  def addPublicKey(userName: String, title: String, publicKey: String): Unit =
+    SshKeys.ins insert (userName, title, publicKey)
+
+  def getPublicKeys(userName: String): List[SshKey] =
+    Query(SshKeys).filter(_.userName is userName.bind).sortBy(_.sshKeyId).list
+
+  def deletePublicKey(userName: String, sshKeyId: Int): Unit =
+    SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete
+
+
+}

src/main/scala/service/SystemSettingsService.scala

@@ -3,14 +3,24 @@ package service
 import util.Directory._
 import util.ControlUtil._
 import SystemSettingsService._
+import javax.servlet.http.HttpServletRequest
 
 trait SystemSettingsService {
 
+  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl.getOrElse {
+    defining(request.getRequestURL.toString){ url =>
+      url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
+    }
+  }.replaceFirst("/$", "")
+
   def saveSystemSettings(settings: SystemSettings): Unit = {
     defining(new java.util.Properties()){ props =>
+      settings.baseUrl.foreach(x => props.setProperty(BaseURL, x.replaceFirst("/\\Z", "")))
       props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
       props.setProperty(Gravatar, settings.gravatar.toString)
       props.setProperty(Notification, settings.notification.toString)
+      props.setProperty(Ssh, settings.ssh.toString)
+      settings.sshPort.foreach(x => props.setProperty(SshPort, x.toString))
       if(settings.notification) {
         settings.smtp.foreach { smtp =>
           props.setProperty(SmtpHost, smtp.host)
@@ -31,7 +41,10 @@ trait SystemSettingsService {
           ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
           props.setProperty(LdapBaseDN, ldap.baseDN)
           props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
           props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+          ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
+          ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
         }
       }
       props.store(new java.io.FileOutputStream(GitBucketConf), null)
@@ -45,9 +58,12 @@ trait SystemSettingsService {
         props.load(new java.io.FileInputStream(GitBucketConf))
       }
       SystemSettings(
+        getOptionValue[String](props, BaseURL, None).map(x => x.replaceFirst("/\\Z", "")),
         getValue(props, AllowAccountRegistration, false),
         getValue(props, Gravatar, true),
         getValue(props, Notification, false),
+        getValue(props, Ssh, false),
+        getOptionValue(props, SshPort, Some(DefaultSshPort)),
         if(getValue(props, Notification, false)){
           Some(Smtp(
             getValue(props, SmtpHost, ""),
@@ -69,7 +85,10 @@ trait SystemSettingsService {
             getOptionValue(props, LdapBindPassword, None),
             getValue(props, LdapBaseDN, ""),
             getValue(props, LdapUserNameAttribute, ""),
-            getValue(props, LdapMailAddressAttribute, "")))
+            getOptionValue(props, LdapFullNameAttribute, None),
+            getValue(props, LdapMailAddressAttribute, ""),
+            getOptionValue[Boolean](props, LdapTls, None),
+            getOptionValue(props, LdapKeystore, None)))
         } else {
           None
         }
@@ -83,9 +102,12 @@ object SystemSettingsService {
   import scala.reflect.ClassTag
 
   case class SystemSettings(
+    baseUrl: Option[String],
     allowAccountRegistration: Boolean,
     gravatar: Boolean,
     notification: Boolean,
+    ssh: Boolean,
+    sshPort: Option[Int],
     smtp: Option[Smtp],
     ldapAuthentication: Boolean,
     ldap: Option[Ldap])
@@ -97,7 +119,10 @@ object SystemSettingsService {
     bindPassword: Option[String],
     baseDN: String,
     userNameAttribute: String,
-    mailAttribute: String)
+    fullNameAttribute: Option[String],
+    mailAttribute: String,
+    tls: Option[Boolean],
+    keystore: Option[String])
 
   case class Smtp(
     host: String,
@@ -108,12 +133,16 @@ object SystemSettingsService {
     fromAddress: Option[String],
     fromName: Option[String])
 
+  val DefaultSshPort = 29418
   val DefaultSmtpPort = 25
   val DefaultLdapPort = 389
 
+  private val BaseURL = "base_url"
   private val AllowAccountRegistration = "allow_account_registration"
   private val Gravatar = "gravatar"
   private val Notification = "notification"
+  private val Ssh = "ssh"
+  private val SshPort = "ssh.port"
   private val SmtpHost = "smtp.host"
   private val SmtpPort = "smtp.port"
   private val SmtpUser = "smtp.user"
@@ -128,7 +157,10 @@ object SystemSettingsService {
   private val LdapBindPassword = "ldap.bind_password"
   private val LdapBaseDN = "ldap.baseDN"
   private val LdapUserNameAttribute = "ldap.username_attribute"
+  private val LdapFullNameAttribute = "ldap.fullname_attribute"
   private val LdapMailAddressAttribute = "ldap.mail_attribute"
+  private val LdapTls = "ldap.tls"
+  private val LdapKeystore = "ldap.keystore"
 
   private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
     defining(props.getProperty(key)){ value =>

src/main/scala/service/WebHookService.scala

@@ -74,18 +74,20 @@ trait WebHookService {
 object WebHookService {
 
   case class WebHookPayload(
+    pusher: WebHookUser,
     ref: String,
     commits: List[WebHookCommit],
     repository: WebHookRepository)
 
   object WebHookPayload {
-    def apply(git: Git, refName: String, repositoryInfo: RepositoryInfo,
+    def apply(git: Git, pusher: Account, refName: String, repositoryInfo: RepositoryInfo,
               commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload =
       WebHookPayload(
+        WebHookUser(pusher.fullName, pusher.mailAddress),
         refName,
         commits.map { commit =>
           val diffs = JGitUtil.getDiffs(git, commit.id, false)
-          val commitUrl = repositoryInfo.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/commit/" + commit.id
+          val commitUrl = repositoryInfo.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/commit/" + commit.id
 
           WebHookCommit(
             id        = commit.id,
@@ -104,7 +106,7 @@ object WebHookService {
         }.toList,
         WebHookRepository(
           name        = repositoryInfo.name,
-          url         = repositoryInfo.url,
+          url         = repositoryInfo.httpUrl,
           description = repositoryInfo.repository.description.getOrElse(""),
           watchers    = 0,
           forks       = repositoryInfo.forkedCount,

src/main/scala/service/WikiService.scala

@@ -1,14 +1,22 @@
 package service
 
-import java.io.File
 import java.util.Date
 import org.eclipse.jgit.api.Git
 import org.apache.commons.io.FileUtils
-import util.{StringUtil, Directory, JGitUtil, LockUtil}
-import util.ControlUtil._
-import org.eclipse.jgit.treewalk.CanonicalTreeParser
-import org.eclipse.jgit.diff.DiffFormatter
-import org.eclipse.jgit.api.errors.PatchApplyException
+import util._
+import _root_.util.ControlUtil._
+import org.eclipse.jgit.treewalk.{TreeWalk, CanonicalTreeParser}
+import org.eclipse.jgit.lib._
+import org.eclipse.jgit.dircache.{DirCache, DirCacheEntry}
+import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.diff.{DiffEntry, DiffFormatter}
+import java.io.ByteArrayInputStream
+import org.eclipse.jgit.patch._
+import org.eclipse.jgit.api.errors.PatchFormatException
+import scala.collection.JavaConverters._
+import scala.Some
+import service.RepositoryService.RepositoryInfo
+
 
 object WikiService {
   
@@ -33,6 +41,10 @@ object WikiService {
    */
   case class WikiPageHistoryInfo(name: String, committer: String, message: String, date: Date)
 
+  def httpUrl(repository: RepositoryInfo) = repository.httpUrl.replaceFirst("\\.git\\Z", ".wiki.git")
+
+  def sshUrl(repository: RepositoryInfo, settings: SystemSettingsService.SystemSettings, userName: String) =
+    repository.sshUrl(settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), userName).replaceFirst("\\.git\\Z", ".wiki.git")
 }
 
 trait WikiService {
@@ -42,13 +54,8 @@ trait WikiService {
     LockUtil.lock(s"${owner}/${repository}/wiki"){
       defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
         if(!dir.exists){
-          try {
-            JGitUtil.initRepository(dir)
-            saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
-          } finally {
-            // once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
-            FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner, repository))
-          }
+          JGitUtil.initRepository(dir)
+          saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
         }
       }
     }
@@ -58,11 +65,12 @@ trait WikiService {
    */
   def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
     using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      optionIf(!JGitUtil.isEmpty(git)){
+      if(!JGitUtil.isEmpty(git)){
         JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
-          WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time, file.commitId)
+          WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
+                       file.committer, file.time, file.commitId)
         }
-      }
+      } else None
     }
   }
 
@@ -71,7 +79,7 @@ trait WikiService {
    */
   def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
     using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
-      optionIf(!JGitUtil.isEmpty(git)){
+      if(!JGitUtil.isEmpty(git)){
         val index = path.lastIndexOf('/')
         val parentPath = if(index < 0) "."  else path.substring(0, index)
         val fileName   = if(index < 0) path else path.substring(index + 1)
@@ -79,7 +87,7 @@ trait WikiService {
         JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
           git.getRepository.open(file.id).getBytes
         }
-      }
+      } else None
     }
 
   /**
@@ -99,12 +107,13 @@ trait WikiService {
    */
   def revertWikiPage(owner: String, repository: String, from: String, to: String,
                      committer: model.Account, pageName: Option[String]): Boolean = {
-    LockUtil.lock(s"${owner}/${repository}/wiki"){
-      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
-        // clone working copy
-        cloneOrPullWorkingCopy(workDir, owner, repository)
 
-        using(Git.open(workDir)){ git =>
+    case class RevertInfo(operation: String, filePath: String, source: String)
+
+    try {
+      LockUtil.lock(s"${owner}/${repository}/wiki"){
+        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+
           val reader = git.getRepository.newObjectReader
           val oldTreeIter = new CanonicalTreeParser
           oldTreeIter.reset(reader, git.getRepository.resolve(from + "^{tree}"))
@@ -112,7 +121,6 @@ trait WikiService {
           val newTreeIter = new CanonicalTreeParser
           newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
 
-          import scala.collection.JavaConverters._
           val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
             pageName match {
               case Some(x) => diff.getNewPath == x + ".md"
@@ -127,72 +135,135 @@ trait WikiService {
             new String(out.toByteArray, "UTF-8")
           }
 
-          try {
-            git.apply.setPatch(new java.io.ByteArrayInputStream(patch.getBytes("UTF-8"))).call
-            git.add.addFilepattern(".").call
-            git.commit.setCommitter(committer.fullName, committer.mailAddress).setMessage(pageName match {
-              case Some(x) => s"Revert ${from} ... ${to} on ${x}"
-              case None    => s"Revert ${from} ... ${to}"
-            }).call
-            git.push.call
-            true
-          } catch {
-            case ex: PatchApplyException => false
+          val p = new Patch()
+          p.parse(new ByteArrayInputStream(patch.getBytes("UTF-8")))
+          if(!p.getErrors.isEmpty){
+            throw new PatchFormatException(p.getErrors())
+          }
+          val revertInfo = (p.getFiles.asScala.map { fh =>
+            fh.getChangeType match {
+              case DiffEntry.ChangeType.MODIFY => {
+                val source = getWikiPage(owner, repository, fh.getNewPath.replaceFirst("\\.md$", "")).map(_.content).getOrElse("")
+                val applied = PatchUtil.apply(source, patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.ADD => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("ADD", fh.getNewPath, applied))
+                } else Nil
+              }
+              case DiffEntry.ChangeType.DELETE => {
+                Seq(RevertInfo("DELETE", fh.getNewPath, ""))
+              }
+              case DiffEntry.ChangeType.RENAME => {
+                val applied = PatchUtil.apply("", patch, fh)
+                if(applied != null){
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""), RevertInfo("ADD", fh.getNewPath, applied))
+                } else {
+                  Seq(RevertInfo("DELETE", fh.getOldPath, ""))
+                }
+              }
+              case _ => Nil
+            }
+          }).flatten
+
+          if(revertInfo.nonEmpty){
+            val builder  = DirCache.newInCore.builder()
+            val inserter = git.getRepository.newObjectInserter()
+            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+
+            using(new RevWalk(git.getRepository)){ revWalk =>
+              using(new TreeWalk(git.getRepository)){ treeWalk =>
+                val index = treeWalk.addTree(revWalk.parseTree(headId))
+                treeWalk.setRecursive(true)
+                while(treeWalk.next){
+                  val path = treeWalk.getPathString
+                  val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
+                  if(revertInfo.find(x => x.filePath == path).isEmpty){
+                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+                  }
+                }
+              }
+            }
+
+            revertInfo.filter(_.operation == "ADD").foreach { x =>
+              builder.add(JGitUtil.createDirCacheEntry(x.filePath, FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, x.source.getBytes("UTF-8"))))
+            }
+            builder.finish()
+
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
+              pageName match {
+                case Some(x) => s"Revert ${from} ... ${to} on ${x}"
+                case None    => s"Revert ${from} ... ${to}"
+              })
           }
         }
       }
+      true
+    } catch {
+      case e: Exception => {
+        e.printStackTrace()
+        false
+      }
     }
   }
 
-
   /**
    * Save the wiki page.
    */
   def saveWikiPage(owner: String, repository: String, currentPageName: String, newPageName: String,
       content: String, committer: model.Account, message: String, currentId: Option[String]): Option[String] = {
-
     LockUtil.lock(s"${owner}/${repository}/wiki"){
-      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
-        // clone working copy
-        cloneOrPullWorkingCopy(workDir, owner, repository)
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var created  = true
+        var updated  = false
+        var removed  = false
 
-        // write as file
-        using(Git.open(workDir)){ git =>
-          defining(new File(workDir, newPageName + ".md")){ file =>
-            // new page
-            val created = !file.exists
-
-            // created or updated
-            val added = executeIf(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
-              FileUtils.writeStringToFile(file, content, "UTF-8")
-              git.add.addFilepattern(file.getName).call
-            }
-
-            // delete file
-            val deleted = executeIf(currentPageName != "" && currentPageName != newPageName){
-              git.rm.addFilepattern(currentPageName + ".md").call
-            }
-
-            // commit and push
-            optionIf(added || deleted){
-              defining(git.commit.setCommitter(committer.fullName, committer.mailAddress)
-                .setMessage(if(message.trim.length == 0){
-                    if(deleted){
-                      s"Rename ${currentPageName} to ${newPageName}"
-                    } else if(created){
-                      s"Created ${newPageName}"
-                    } else {
-                      s"Updated ${newPageName}"
-                    }
-                  } else {
-                    message
-                  }).call){ commit =>
-                git.push.call
-                Some(commit.getName)
+        if(headId != null){
+          using(new RevWalk(git.getRepository)){ revWalk =>
+            using(new TreeWalk(git.getRepository)){ treeWalk =>
+              val index = treeWalk.addTree(revWalk.parseTree(headId))
+              treeWalk.setRecursive(true)
+              while(treeWalk.next){
+                val path = treeWalk.getPathString
+                val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
+                if(path == currentPageName + ".md" && currentPageName != newPageName){
+                  removed = true
+                } else if(path != newPageName + ".md"){
+                  builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+                } else {
+                  created = false
+                  updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
+                }
               }
             }
           }
         }
+
+        if(created || updated || removed){
+          builder.add(JGitUtil.createDirCacheEntry(newPageName + ".md", FileMode.REGULAR_FILE, inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+          builder.finish()
+          val newHeadId = JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer.fullName, committer.mailAddress,
+            if(message.trim.length == 0) {
+              if(removed){
+                s"Rename ${currentPageName} to ${newPageName}"
+              } else if(created){
+                s"Created ${newPageName}"
+              } else {
+                s"Updated ${newPageName}"
+              }
+            } else {
+              message
+            })
+
+          Some(newHeadId)
+        } else None
       }
     }
   }
@@ -203,35 +274,34 @@ trait WikiService {
   def deleteWikiPage(owner: String, repository: String, pageName: String,
                      committer: String, mailAddress: String, message: String): Unit = {
     LockUtil.lock(s"${owner}/${repository}/wiki"){
-      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
-        // clone working copy
-        cloneOrPullWorkingCopy(workDir, owner, repository)
+      using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+        var removed  = false
 
-        // delete file
-        new File(workDir, pageName + ".md").delete
+        using(new RevWalk(git.getRepository)){ revWalk =>
+          using(new TreeWalk(git.getRepository)){ treeWalk =>
+            val index = treeWalk.addTree(revWalk.parseTree(headId))
+            treeWalk.setRecursive(true)
+            while(treeWalk.next){
+              val path = treeWalk.getPathString
+              val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
+              if(path != pageName + ".md"){
+                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+              } else {
+                removed = true
+              }
+            }
+          }
 
-        using(Git.open(workDir)){ git =>
-          git.rm.addFilepattern(pageName + ".md").call
-
-          // commit and push
-          git.commit.setCommitter(committer, mailAddress).setMessage(message).call
-          git.push.call
+          if(removed){
+            builder.finish()
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
+          }
         }
       }
     }
   }
 
-  private def cloneOrPullWorkingCopy(workDir: File, owner: String, repository: String): Unit = {
-    if(!workDir.exists){
-      Git.cloneRepository
-        .setURI(Directory.getWikiRepositoryDir(owner, repository).toURI.toString)
-        .setDirectory(workDir)
-        .call
-        .getRepository
-        .close
-    } else using(Git.open(workDir)){ git =>
-      git.pull.call
-    }
-  }
-
 }

src/main/scala/servlet/AutoUpdateListener.scala

@@ -50,6 +50,11 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    Version(1, 12),
+    Version(1, 11),
+    Version(1, 10),
+    Version(1, 9),
+    Version(1, 8),
     Version(1, 7),
     Version(1, 6),
     Version(1, 5),
@@ -86,14 +91,14 @@ object AutoUpdate {
   /**
    * The version file (GITBUCKET_HOME/version).
    */
-  val versionFile = new File(GitBucketHome, "version")
+  lazy val versionFile = new File(GitBucketHome, "version")
   
   /**
    * Returns the current version from the version file.
    */
   def getCurrentVersion(): Version = {
     if(versionFile.exists){
-      FileUtils.readFileToString(versionFile, "UTF-8").split("\\.") match {
+      FileUtils.readFileToString(versionFile, "UTF-8").trim.split("\\.") match {
         case Array(majorVersion, minorVersion) => {
           versions.find { v => 
             v.majorVersion == majorVersion.toInt && v.minorVersion == minorVersion.toInt
@@ -101,11 +106,8 @@ object AutoUpdate {
         }
         case _ => Version(0, 0)
       }
-    } else {
-      Version(0, 0)
-    }
-    
-  }  
+    } else Version(0, 0)
+  }
   
 }
 
@@ -117,8 +119,12 @@ class AutoUpdateListener extends ServletContextListener {
   private val logger = LoggerFactory.getLogger(classOf[AutoUpdateListener])
   
   override def contextInitialized(event: ServletContextEvent): Unit = {
+    val datadir = event.getServletContext.getInitParameter("gitbucket.home")
+    if(datadir != null){
+      System.setProperty("gitbucket.home", datadir)
+    }
     org.h2.Driver.load()
-    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome}")
+    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome};MVCC=true")
 
     logger.debug("Start schema update")
     defining(getConnection(event.getServletContext)){ conn =>

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -8,8 +8,8 @@ import org.slf4j.LoggerFactory
 
 import javax.servlet.ServletConfig
 import javax.servlet.ServletContext
-import javax.servlet.http.HttpServletRequest
-import util.{Keys, JGitUtil, Directory}
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import util.{StringUtil, Keys, JGitUtil, Directory}
 import util.ControlUtil._
 import util.Implicits._
 import service._
@@ -23,7 +23,7 @@ import util.JGitUtil.CommitInfo
  * This servlet provides only Git repository functionality.
  * Authentication is provided by [[servlet.BasicAuthenticationFilter]].
  */
-class GitRepositoryServlet extends GitServlet {
+class GitRepositoryServlet extends GitServlet with SystemSettingsService {
 
   private val logger = LoggerFactory.getLogger(classOf[GitRepositoryServlet])
   
@@ -43,33 +43,45 @@ class GitRepositoryServlet extends GitServlet {
 
       def getServletContext(): ServletContext = config.getServletContext
       def getServletName(): String = config.getServletName
-    });
+    })
 
     super.init(config)
   }
-  
+
+  override def service(req: HttpServletRequest, res: HttpServletResponse): Unit = {
+    val agent = req.getHeader("USER-AGENT")
+    val index = req.getRequestURI.indexOf(".git")
+    if(index >= 0 && (agent == null || agent.toLowerCase.indexOf("git/") < 0)){
+      // redirect for browsers
+      val paths = req.getRequestURI.substring(0, index).split("/")
+      res.sendRedirect(baseUrl(req) + "/" + paths.dropRight(1).last + "/" + paths.last)
+    } else {
+      // response for git client
+      super.service(req, res)
+    }
+  }
 }
 
-class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] {
+class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService {
   
   private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory])
-  
+
   override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
     val receivePack = new ReceivePack(db)
-    val userName = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]
+    val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]
 
     logger.debug("requestURI: " + request.getRequestURI)
-    logger.debug("userName:" + userName)
+    logger.debug("pusher:" + pusher)
 
     defining(request.paths){ paths =>
       val owner      = paths(1)
       val repository = paths(2).replaceFirst("\\.git$", "")
-      val baseURL    = request.getRequestURL.toString.replaceFirst("/git/.*", "")
 
       logger.debug("repository:" + owner + "/" + repository)
-      logger.debug("baseURL:" + baseURL)
 
-      receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, userName, baseURL))
+      if(!repository.endsWith(".wiki")){
+        receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseUrl(request)))
+      }
       receivePack
     }
   }
@@ -77,84 +89,130 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, userName: String, baseURL: String) extends PostReceiveHook
-  with RepositoryService with AccountService with IssuesService with ActivityService with WebHookService {
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook
+  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
   
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
   
   def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
-    using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
-      commands.asScala.foreach { command =>
-        logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
-        val commits = command.getType match {
-          case ReceiveCommand.Type.DELETE => Nil
-          case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
-        }
-        val refName = command.getRefName.split("/")
-        val branchName = refName.drop(2).mkString("/")
-
-        // Extract new commit and apply issue comment
-        val newCommits = if(commits.size > 1000){
-          val existIds = getAllCommitIds(owner, repository)
-          commits.flatMap { commit =>
-            optionIf(!existIds.contains(commit.id)){
-              createIssueComment(commit)
-              Some(commit)
+    try {
+      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
+        commands.asScala.foreach { command =>
+          logger.debug(s"commandType: ${command.getType}, refName: ${command.getRefName}")
+          val refName = command.getRefName.split("/")
+          val branchName = refName.drop(2).mkString("/")
+          val commits = if (refName(1) == "tags") {
+            Nil
+          } else {
+            command.getType match {
+              case ReceiveCommand.Type.DELETE => Nil
+              case _ => JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
             }
           }
-        } else {
-          commits.flatMap { commit =>
-            optionIf(!existsCommitId(owner, repository, commit.id)){
-              createIssueComment(commit)
-              Some(commit)
+
+          // Extract new commit and apply issue comment
+          val newCommits = if(commits.size > 1000){
+            val existIds = getAllCommitIds(owner, repository)
+            commits.flatMap { commit =>
+              if(!existIds.contains(commit.id)){
+                createIssueComment(commit)
+                Some(commit)
+              } else None
+            }
+          } else {
+            commits.flatMap { commit =>
+              if(!existsCommitId(owner, repository, commit.id)){
+                createIssueComment(commit)
+                Some(commit)
+              } else None
             }
           }
-        }
 
-        // batch insert all new commit id
-        insertAllCommitIds(owner, repository, newCommits.map(_.id))
+          // batch insert all new commit id
+          insertAllCommitIds(owner, repository, newCommits.map(_.id))
 
-        // record activity
-        if(refName(1) == "heads"){
-          command.getType match {
-            case ReceiveCommand.Type.CREATE => recordCreateBranchActivity(owner, repository, userName, branchName)
-            case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, userName, branchName, newCommits)
-            case ReceiveCommand.Type.DELETE => recordDeleteBranchActivity(owner, repository, userName, branchName)
+          // record activity
+          if(refName(1) == "heads"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE => recordCreateBranchActivity(owner, repository, pusher, branchName)
+              case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, pusher, branchName, newCommits)
+              case ReceiveCommand.Type.DELETE => recordDeleteBranchActivity(owner, repository, pusher, branchName)
+              case _ =>
+            }
+          } else if(refName(1) == "tags"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, pusher, branchName, newCommits)
+              case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, pusher, branchName, newCommits)
+              case _ =>
+            }
+          }
+
+          if(refName(1) == "heads"){
+            command.getType match {
+              case ReceiveCommand.Type.CREATE |
+                   ReceiveCommand.Type.UPDATE |
+                   ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
+                updatePullRequests(branchName)
+              case _ =>
+            }
+          }
+
+          // close issues
+          val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
+          if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
+            git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit =>
+              closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
+            }
+          }
+
+          // call web hook
+          getWebHookURLs(owner, repository) match {
+            case webHookURLs if(webHookURLs.nonEmpty) =>
+              for(pusherAccount <- getAccountByUserName(pusher);
+                  ownerAccount   <- getAccountByUserName(owner);
+                  repositoryInfo <- getRepository(owner, repository, baseUrl)){
+                callWebHook(owner, repository, webHookURLs,
+                  WebHookPayload(git, pusherAccount, command.getRefName, repositoryInfo, newCommits, ownerAccount))
+              }
             case _ =>
           }
-        } else if(refName(1) == "tags"){
-          command.getType match {
-            case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, branchName, newCommits)
-            case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, userName, branchName, newCommits)
-            case _ =>
-          }
-        }
-
-        // call web hook
-        val webHookURLs = getWebHookURLs(owner, repository)
-        if(webHookURLs.nonEmpty){
-          val payload = WebHookPayload(
-            git,
-            command.getRefName,
-            getRepository(owner, repository, baseURL).get,
-            newCommits,
-            getAccountByUserName(owner).get)
-
-          callWebHook(owner, repository, webHookURLs, payload)
         }
       }
+      // update repository last modified time.
+      updateLastActivityDate(owner, repository)
+    } catch {
+      case ex: Exception => {
+        logger.error(ex.toString, ex)
+        throw ex
+      }
     }
-    // update repository last modified time.
-    updateLastActivityDate(owner, repository)
   }
 
   private def createIssueComment(commit: CommitInfo) = {
-    "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
-      val issueId = matchData.group(2)
-      if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
-        createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+    StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
+      if(getIssue(owner, repository, issueId).isDefined){
+        getAccountByMailAddress(commit.mailAddress).foreach { account =>
+          createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
+        }
       }
     }
   }
 
+  /**
+   * Fetch pull request contents into refs/pull/${issueId}/head and update pull request table.
+   */
+  private def updatePullRequests(branch: String) =
+    getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
+      if(getRepository(pullreq.userName, pullreq.repositoryName, baseUrl).isDefined){
+        using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName))){ git =>
+          git.fetch
+            .setRemote(Directory.getRepositoryDir(owner, repository).toURI.toString)
+            .setRefSpecs(new RefSpec(s"refs/heads/${branch}:refs/pull/${pullreq.issueId}/head").setForceUpdate(true))
+            .call
+
+          val commitIdTo = git.getRepository.resolve(s"refs/pull/${pullreq.issueId}/head").getName
+          updateCommitIdTo(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo)
+        }
+      }
+    }
 }

src/main/scala/ssh/GitCommand.scala

@@ -0,0 +1,130 @@
+package ssh
+
+import org.apache.sshd.server.{CommandFactory, Environment, ExitCallback, Command}
+import org.slf4j.LoggerFactory
+import java.io.{InputStream, OutputStream}
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
+import util.Directory._
+import org.eclipse.jgit.transport.{ReceivePack, UploadPack}
+import org.apache.sshd.server.command.UnknownCommand
+import servlet.{Database, CommitLogHook}
+import service.{AccountService, RepositoryService, SystemSettingsService}
+import org.eclipse.jgit.errors.RepositoryNotFoundException
+import javax.servlet.ServletContext
+
+
+object GitCommand {
+  val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
+}
+
+abstract class GitCommand(val context: ServletContext, val owner: String, val repoName: String) extends Command {
+  self: RepositoryService with AccountService =>
+
+  private val logger = LoggerFactory.getLogger(classOf[GitCommand])
+  protected var err: OutputStream = null
+  protected var in: InputStream = null
+  protected var out: OutputStream = null
+  protected var callback: ExitCallback = null
+
+  protected def runTask(user: String): Unit
+
+  private def newTask(user: String): Runnable = new Runnable {
+    override def run(): Unit = {
+      Database(context) withTransaction {
+        try {
+          runTask(user)
+          callback.onExit(0)
+        } catch {
+          case e: RepositoryNotFoundException =>
+            logger.info(e.getMessage)
+            callback.onExit(1, "Repository Not Found")
+          case e: Throwable =>
+            logger.error(e.getMessage, e)
+            callback.onExit(1)
+        }
+      }
+    }
+  }
+
+  override def start(env: Environment): Unit = {
+    val user = env.getEnv.get("USER")
+    val thread = new Thread(newTask(user))
+    thread.start()
+  }
+
+  override def destroy(): Unit = {}
+
+  override def setExitCallback(callback: ExitCallback): Unit = {
+    this.callback = callback
+  }
+
+  override def setErrorStream(err: OutputStream): Unit = {
+    this.err = err
+  }
+
+  override def setOutputStream(out: OutputStream): Unit = {
+    this.out = out
+  }
+
+  override def setInputStream(in: InputStream): Unit = {
+    this.in = in
+  }
+
+  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo): Boolean =
+    getAccountByUserName(username) match {
+      case Some(account) => hasWritePermission(repositoryInfo.owner, repositoryInfo.name, Some(account))
+      case None => false
+    }
+
+}
+
+class GitUploadPack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
+    with RepositoryService with AccountService {
+
+  override protected def runTask(user: String): Unit = {
+    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
+      if(!repositoryInfo.repository.isPrivate || isWritableUser(user, repositoryInfo)){
+        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
+          val repository = git.getRepository
+          val upload = new UploadPack(repository)
+          upload.upload(in, out, err)
+        }
+      }
+    }
+  }
+
+}
+
+class GitReceivePack(context: ServletContext, owner: String, repoName: String, baseUrl: String) extends GitCommand(context, owner, repoName)
+    with SystemSettingsService with RepositoryService with AccountService {
+
+  override protected def runTask(user: String): Unit = {
+    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
+      if(isWritableUser(user, repositoryInfo)){
+        using(Git.open(getRepositoryDir(owner, repoName))) { git =>
+          val repository = git.getRepository
+          val receive = new ReceivePack(repository)
+          if(!repoName.endsWith(".wiki")){
+            receive.setPostReceiveHook(new CommitLogHook(owner, repoName, user, baseUrl))
+          }
+          receive.receive(in, out, err)
+        }
+      }
+    }
+  }
+
+}
+
+class GitCommandFactory(context: ServletContext, baseUrl: String) extends CommandFactory {
+  private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])
+
+  override def createCommand(command: String): Command = {
+    logger.debug(s"command: $command")
+    command match {
+      case GitCommand.CommandRegex("upload", owner, repoName) => new GitUploadPack(context, owner, repoName, baseUrl)
+      case GitCommand.CommandRegex("receive", owner, repoName) => new GitReceivePack(context, owner, repoName, baseUrl)
+      case _ => new UnknownCommand(command)
+    }
+  }
+}

src/main/scala/ssh/NoShell.scala

@@ -0,0 +1,62 @@
+package ssh
+
+import org.apache.sshd.common.Factory
+import org.apache.sshd.server.{Environment, ExitCallback, Command}
+import java.io.{OutputStream, InputStream}
+import org.eclipse.jgit.lib.Constants
+import service.SystemSettingsService
+
+class NoShell extends Factory[Command] with SystemSettingsService {
+  override def create(): Command = new Command() {
+    private var in: InputStream = null
+    private var out: OutputStream = null
+    private var err: OutputStream = null
+    private var callback: ExitCallback = null
+
+    override def start(env: Environment): Unit = {
+      val user = env.getEnv.get("USER")
+      val port = loadSystemSettings().sshPort.getOrElse(SystemSettingsService.DefaultSshPort)
+      val message =
+        """
+          | Welcome to
+          |   _____   _   _     ____                   _             _
+          |  / ____| (_) | |   |  _ \                 | |           | |
+          | | |  __   _  | |_  | |_) |  _   _    ___  | | __   ___  | |_
+          | | | |_ | | | | __| |  _ <  | | | |  / __| | |/ /  / _ \ | __|
+          | | |__| | | | | |_  | |_) | | |_| | | (__  |   <  |  __/ | |_
+          |  \_____| |_|  \__| |____/   \__,_|  \___| |_|\_\  \___|  \__|
+          |
+          | Successfully SSH Access.
+          | But interactive shell is disabled.
+          |
+          | Please use:
+          |
+          | git clone ssh://%s@GITBUCKET_HOST:%d/OWNER/REPOSITORY_NAME.git
+        """.stripMargin.format(user, port).replace("\n", "\r\n") + "\r\n"
+      err.write(Constants.encode(message))
+      err.flush()
+      in.close()
+      out.close()
+      err.close()
+      callback.onExit(127)
+    }
+
+    override def destroy(): Unit = {}
+
+    override def setInputStream(in: InputStream): Unit = {
+      this.in = in
+    }
+
+    override def setOutputStream(out: OutputStream): Unit = {
+      this.out = out
+    }
+
+    override def setErrorStream(err: OutputStream): Unit = {
+      this.err = err
+    }
+
+    override def setExitCallback(callback: ExitCallback): Unit = {
+      this.callback = callback
+    }
+  }
+}

src/main/scala/ssh/PublicKeyAuthenticator.scala

@@ -0,0 +1,23 @@
+package ssh
+
+import org.apache.sshd.server.PublickeyAuthenticator
+import org.apache.sshd.server.session.ServerSession
+import java.security.PublicKey
+import service.SshKeyService
+import servlet.Database
+import javax.servlet.ServletContext
+
+class PublicKeyAuthenticator(context: ServletContext) extends PublickeyAuthenticator with SshKeyService {
+
+  override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean = {
+    Database(context) withTransaction {
+      getPublicKeys(username).exists { sshKey =>
+        SshUtil.str2PublicKey(sshKey.publicKey) match {
+          case Some(publicKey) => key.equals(publicKey)
+          case _ => false
+        }
+      }
+    }
+  }
+
+}

src/main/scala/ssh/SshServerListener.scala

@@ -0,0 +1,68 @@
+package ssh
+
+import javax.servlet.{ServletContext, ServletContextEvent, ServletContextListener}
+import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider
+import org.slf4j.LoggerFactory
+import util.Directory
+import service.SystemSettingsService
+import java.util.concurrent.atomic.AtomicBoolean
+
+object SshServer {
+  private val logger = LoggerFactory.getLogger(SshServer.getClass)
+  private val server = org.apache.sshd.SshServer.setUpDefaultServer()
+  private val active = new AtomicBoolean(false)
+
+  private def configure(context: ServletContext, port: Int, baseUrl: String) = {
+    server.setPort(port)
+    server.setKeyPairProvider(new SimpleGeneratorHostKeyProvider(s"${Directory.GitBucketHome}/gitbucket.ser"))
+    server.setPublickeyAuthenticator(new PublicKeyAuthenticator(context))
+    server.setCommandFactory(new GitCommandFactory(context, baseUrl))
+    server.setShellFactory(new NoShell)
+  }
+
+  def start(context: ServletContext, port: Int, baseUrl: String) = {
+    if(active.compareAndSet(false, true)){
+      configure(context, port, baseUrl)
+      server.start()
+      logger.info(s"Start SSH Server Listen on ${server.getPort}")
+    }
+  }
+
+  def stop() = {
+    if(active.compareAndSet(true, false)){
+      server.stop(true)
+    }
+  }
+
+  def isActive = active.get
+}
+
+/*
+ * Start a SSH Server Daemon
+ *
+ * How to use:
+ * git clone ssh://username@host_or_ip:29418/owner/repository_name.git
+ */
+class SshServerListener extends ServletContextListener with SystemSettingsService {
+
+  override def contextInitialized(sce: ServletContextEvent): Unit = {
+    val settings = loadSystemSettings()
+    if(settings.ssh){
+      if(settings.baseUrl.isEmpty){
+        // TODO use logger?
+        println("Could not start SshServer because the baseUrl is not configured.")
+      } else {
+        SshServer.start(sce.getServletContext,
+          settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
+          settings.baseUrl.get)
+      }
+    }
+  }
+
+  override def contextDestroyed(sce: ServletContextEvent): Unit = {
+    if(loadSystemSettings().ssh){
+      SshServer.stop()
+    }
+  }
+
+}

src/main/scala/ssh/SshUtil.scala

@@ -0,0 +1,33 @@
+package ssh
+
+import java.security.PublicKey
+import org.slf4j.LoggerFactory
+import org.apache.commons.codec.binary.Base64
+import org.eclipse.jgit.lib.Constants
+import org.apache.sshd.common.util.{KeyUtils, Buffer}
+
+object SshUtil {
+
+  private val logger = LoggerFactory.getLogger(SshUtil.getClass)
+
+  def str2PublicKey(key: String): Option[PublicKey] = {
+    // TODO RFC 4716 Public Key is not supported...
+    val parts = key.split(" ")
+    if (parts.size < 2) {
+      logger.debug(s"Invalid PublicKey Format: key")
+      return None
+    }
+    try {
+      val encodedKey = parts(1)
+      val decode = Base64.decodeBase64(Constants.encodeASCII(encodedKey))
+      Some(new Buffer(decode).getRawPublicKey)
+    } catch {
+      case e: Throwable =>
+        logger.debug(e.getMessage, e)
+        None
+    }
+  }
+
+  def fingerPrint(key: String): String = KeyUtils.getFingerPrint(str2PublicKey(key).get)
+
+}

src/main/scala/util/Authenticator.scala

@@ -29,7 +29,7 @@ trait OneselfAuthenticator { self: ControllerBase =>
 /**
  * Allows only the repository owner and administrators.
  */
-trait OwnerAuthenticator { self: ControllerBase with RepositoryService =>
+trait OwnerAuthenticator { self: ControllerBase with RepositoryService with AccountService =>
   protected def ownerOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
   protected def ownerOnly[T](action: (T, RepositoryInfo) => Any) = (form: T) => { authenticate(action(form, _)) }
 
@@ -40,6 +40,9 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService =>
           context.loginAccount match {
             case Some(x) if(x.isAdmin) => action(repository)
             case Some(x) if(repository.owner == x.userName) => action(repository)
+            case Some(x) if(getGroupMembers(repository.owner).exists { member =>
+              member.userName == x.userName && member.isManager == true
+            }) => action(repository)
             case _ => Unauthorized()
           }
         } getOrElse NotFound()
@@ -106,7 +109,7 @@ trait CollaboratorsAuthenticator { self: ControllerBase with RepositoryService =
 }
 
 /**
- * Allows only the repository owner and administrators.
+ * Allows only the repository owner (or manager for group repository) and administrators.
  */
 trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
   protected def referrersOnly(action: (RepositoryInfo) => Any) = { authenticate(action) }
@@ -155,3 +158,24 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService =
     }
   }
 }
+
+/**
+ * Allows only the group managers.
+ */
+trait GroupManagerAuthenticator { self: ControllerBase with AccountService =>
+  protected def managersOnly(action: => Any) = { authenticate(action) }
+  protected def managersOnly[T](action: T => Any) = (form: T) => { authenticate(action(form)) }
+
+  private def authenticate(action: => Any) = {
+    {
+      defining(request.paths){ paths =>
+        context.loginAccount match {
+          case Some(x) if(getGroupMembers(paths(0)).exists { member =>
+            member.userName == x.userName && member.isManager
+          }) => action
+          case _ => Unauthorized()
+        }
+      }
+    }
+  }
+}

src/main/scala/util/ControlUtil.scala

@@ -3,6 +3,8 @@ package util
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
+import scala.util.control.Exception._
+import scala.language.reflectiveCalls
 
 /**
  * Provides control facilities.
@@ -14,21 +16,19 @@ object ControlUtil {
   def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B =
     try f(resource) finally {
       if(resource != null){
-        try {
+        ignoring(classOf[Throwable]) {
           resource.close()
-        } catch {
-          case e: Throwable => // ignore
         }
       }
     }
 
   def using[T](git: Git)(f: Git => T): T =
-    try f(git) finally git.getRepository.close
+    try f(git) finally git.getRepository.close()
 
   def using[T](git1: Git, git2: Git)(f: (Git, Git) => T): T =
     try f(git1, git2) finally {
-      git1.getRepository.close
-      git2.getRepository.close
+      git1.getRepository.close()
+      git2.getRepository.close()
     }
 
   def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
@@ -37,12 +37,15 @@ object ControlUtil {
   def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
     try f(treeWalk) finally treeWalk.release()
 
-  def executeIf(condition: => Boolean)(action: => Unit): Boolean =
-    if(condition){
-      action
-      true
-    } else false
 
-  def optionIf[T](condition: => Boolean)(action: => Option[T]): Option[T] =
-    if(condition) action else None
+//  def withTmpRefSpec[T](ref: RefSpec, git: Git)(f: RefSpec => T): T = {
+//    try {
+//      f(ref)
+//    } finally {
+//      val refUpdate = git.getRepository.updateRef(ref.getDestination)
+//      refUpdate.setForceUpdate(true)
+//      refUpdate.delete()
+//    }
+//  }
+
 }

src/main/scala/util/Directory.scala

@@ -2,15 +2,30 @@ package util
 
 import java.io.File
 import util.ControlUtil._
+import org.apache.commons.io.FileUtils
 
 /**
  * Provides directories used by GitBucket.
  */
 object Directory {
 
-  val GitBucketHome = (scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
-    case Some(env) => new File(env)
-    case None => new File(System.getProperty("user.home"), "gitbucket")
+  val GitBucketHome = (System.getProperty("gitbucket.home") match {
+    // -Dgitbucket.home=<path>
+    case path if(path != null) => new File(path)
+    case _ => scala.util.Properties.envOrNone("GITBUCKET_HOME") match {
+      // environment variable GITBUCKET_HOME
+      case Some(env) => new File(env)
+      // default is HOME/.gitbucket
+      case None => {
+        val oldHome = new File(System.getProperty("user.home"), "gitbucket")
+        if(oldHome.exists && oldHome.isDirectory && new File(oldHome, "version").exists){
+          //FileUtils.moveDirectory(oldHome, newHome)
+          oldHome
+        } else {
+          new File(System.getProperty("user.home"), ".gitbucket")
+        }
+      }
+    }
   }).getAbsolutePath
 
   val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")
@@ -56,25 +71,10 @@ object Directory {
   def getDownloadWorkDir(owner: String, repository: String, sessionId: String): File = 
     new File(getTemporaryDir(owner, repository), s"download/${sessionId}")
   
-  /**
-   * Temporary directory which is used in the repository creation.
-   *
-   * GitBucket generates initial repository contents in this directory and push them.
-   * This directory is removed after the repository creation.
-   */
-  def getInitRepositoryDir(owner: String, repository: String): File =
-    new File(getTemporaryDir(owner, repository), "init")
-  
   /**
    * Substance directory of the wiki repository.
    */
   def getWikiRepositoryDir(owner: String, repository: String): File =
     new File(s"${RepositoryHome}/${owner}/${repository}.wiki.git")
-  
-  /**
-   * Wiki working directory which is cloned from the wiki repository.
-   */
-  def getWikiWorkDir(owner: String, repository: String): File =
-    new File(getTemporaryDir(owner, repository), "wiki")
 
 }

src/main/scala/util/FileUtil.scala

@@ -63,9 +63,9 @@ object FileUtil {
     if(dir.exists()){
       FileUtils.deleteDirectory(dir)
     }
-    try{
+    try {
       action(dir)
-    }finally{
+    } finally {
       FileUtils.deleteDirectory(dir)
     }
   }

src/main/scala/util/Implicits.scala

@@ -1,6 +1,7 @@
 package util
 
 import scala.util.matching.Regex
+import scala.util.control.Exception._
 import javax.servlet.http.{HttpSession, HttpServletRequest}
 
 /**
@@ -42,10 +43,8 @@ object Implicits {
       sb.toString
     }
 
-    def toIntOpt: Option[Int] = try {
-      Option(Integer.parseInt(value))
-    } catch {
-      case e: NumberFormatException => None
+    def toIntOpt: Option[Int] = catching(classOf[NumberFormatException]) opt {
+      Integer.parseInt(value)
     }
   }
 

src/main/scala/util/JGitUtil.scala

@@ -11,16 +11,20 @@ import org.eclipse.jgit.revwalk.filter._
 import org.eclipse.jgit.treewalk._
 import org.eclipse.jgit.treewalk.filter._
 import org.eclipse.jgit.diff.DiffEntry.ChangeType
-import org.eclipse.jgit.errors.MissingObjectException
+import org.eclipse.jgit.errors.{ConfigInvalidException, MissingObjectException}
 import java.util.Date
 import org.eclipse.jgit.api.errors.NoHeadException
 import service.RepositoryService
+import org.eclipse.jgit.dircache.DirCacheEntry
+import org.slf4j.LoggerFactory
 
 /**
  * Provides complex JGit operations.
  */
 object JGitUtil {
 
+  private val logger = LoggerFactory.getLogger(JGitUtil.getClass)
+
   /**
    * The repository data.
    *
@@ -44,9 +48,10 @@ object JGitUtil {
    * @param commitId the last commit id
    * @param committer the last committer name
    * @param mailAddress the committer's mail address
+   * @param linkUrl the url of submodule
    */
   case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
-                      committer: String, mailAddress: String)
+                      committer: String, mailAddress: String, linkUrl: Option[String])
 
   /**
    * The commit data.
@@ -71,16 +76,12 @@ object JGitUtil {
         rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
-    val summary = 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
-      }
-    }
+    val summary = getSummaryMessage(fullMessage, shortMessage)
 
     val description = defining(fullMessage.trim.indexOf("\n")){ i =>
-      optionIf(i >= 0){
+      if(i >= 0){
         Some(fullMessage.trim.substring(i).trim)
-      }
+      } else None
     }
   }
 
@@ -103,6 +104,15 @@ object JGitUtil {
    */
   case class TagInfo(name: String, time: Date, id: String)
 
+  /**
+   * The submodule data
+   *
+   * @param name the module name
+   * @param path the path in the repository
+   * @param url the repository url of this module
+   */
+  case class SubmoduleInfo(name: String, path: String, url: String)
+
   /**
    * Returns RevCommit from the commit or tag id.
    * 
@@ -127,7 +137,7 @@ object JGitUtil {
     using(Git.open(getRepositoryDir(owner, repository))){ git =>
       try {
         // get commit count
-        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(1000).sum
+        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum
 
         RepositoryInfo(
           owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",
@@ -151,7 +161,7 @@ object JGitUtil {
       }
     }
   }
-  
+
   /**
    * Returns the file list of the specified path.
    * 
@@ -161,7 +171,7 @@ object JGitUtil {
    * @return HTML of the file list
    */
   def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
-    val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String)]
+    val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String, Option[String])]
 
     using(new RevWalk(git.getRepository)){ revWalk =>
       val objectId  = git.getRepository.resolve(revision)
@@ -194,22 +204,30 @@ object JGitUtil {
           })
         }
         while (treeWalk.next()) {
-          list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString))
+          // submodule
+          val linkUrl = if(treeWalk.getFileMode(0) == FileMode.GITLINK){
+            getSubmodules(git, revCommit.getTree).find(_.path == treeWalk.getPathString).map(_.url)
+          } else None
+
+          list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString, linkUrl))
         }
       }
     }
 
     val commits = getLatestCommitFromPaths(git, list.toList.map(_._3), revision)
-    list.map { case (objectId, fileMode, path, name) =>
-      FileInfo(
-        objectId,
-        fileMode == FileMode.TREE,
-        name,
-        commits(path).getCommitterIdent.getWhen,
-        commits(path).getShortMessage,
-        commits(path).getName,
-        commits(path).getCommitterIdent.getName,
-        commits(path).getCommitterIdent.getEmailAddress)
+    list.map { case (objectId, fileMode, path, name, linkUrl) =>
+      defining(commits(path)){ commit =>
+        FileInfo(
+          objectId,
+          fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
+          name,
+          commit.getCommitterIdent.getWhen,
+          getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
+          commit.getName,
+          commit.getCommitterIdent.getName,
+          commit.getCommitterIdent.getEmailAddress,
+          linkUrl)
+      }
     }.sortWith { (file1, file2) =>
       (file1.isDirectory, file2.isDirectory) match {
         case (true , false) => true
@@ -218,7 +236,18 @@ object JGitUtil {
       }
     }.toList
   }
-  
+
+  /**
+   * Returns the first line of the commit message.
+   */
+  private def getSummaryMessage(fullMessage: String, shortMessage: String): String = {
+    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
+      }
+    }
+  }
+
   /**
    * Returns the commit list of the specified branch.
    * 
@@ -324,27 +353,6 @@ object JGitUtil {
     }.toMap
   }
 
-  /**
-   * Get object content of the given id as String from the Git repository.
-   * 
-   * @param git the Git object
-   * @param id the object id
-   * @param large if false then returns None for the large file
-   * @return the object or None if object does not exist
-   */
-  def getContent(git: Git, id: ObjectId, large: Boolean): Option[Array[Byte]] = try {
-    val loader = git.getRepository.getObjectDatabase.open(id)
-    if(large == false && FileUtil.isLarge(loader.getSize)){
-      None
-    } else {
-      using(git.getRepository.getObjectDatabase){ db =>
-        Some(db.open(id).getBytes)
-      }
-    }
-  } catch {
-    case e: MissingObjectException => None
-  }
-
   /**
    * Returns the tuple of diff of the given commit and the previous commit id.
    */
@@ -376,7 +384,7 @@ object JGitUtil {
               DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None, None)
             } else {
               DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None,
-                JGitUtil.getContent(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray))
+                JGitUtil.getContentFromId(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray))
             }))
           }
           (buffer.toList, None)
@@ -399,8 +407,8 @@ object JGitUtil {
         DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath, None, None)
       } else {
         DiffInfo(diff.getChangeType, diff.getOldPath, diff.getNewPath,
-          JGitUtil.getContent(git, diff.getOldId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
-          JGitUtil.getContent(git, diff.getNewId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray))
+          JGitUtil.getContentFromId(git, diff.getOldId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray),
+          JGitUtil.getContentFromId(git, diff.getNewId.toObjectId, false).filter(FileUtil.isText).map(convertFromByteArray))
       }
     }.toList
   }
@@ -464,4 +472,102 @@ object JGitUtil {
     }.find(_._1 != null)
   }
 
+  def createDirCacheEntry(path: String, mode: FileMode, objectId: ObjectId): DirCacheEntry = {
+    val entry = new DirCacheEntry(path)
+    entry.setFileMode(mode)
+    entry.setObjectId(objectId)
+    entry
+  }
+
+  def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
+                              fullName: String, mailAddress: String, message: String): String = {
+    val newCommit = new CommitBuilder()
+    newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
+    newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
+    newCommit.setMessage(message)
+    if(headId != null){
+      newCommit.setParentIds(List(headId).asJava)
+    }
+    newCommit.setTreeId(treeId)
+
+    val newHeadId = inserter.insert(newCommit)
+    inserter.flush()
+    inserter.release()
+
+    val refUpdate = git.getRepository.updateRef(Constants.HEAD)
+    refUpdate.setNewObjectId(newHeadId)
+    refUpdate.update()
+
+    newHeadId.getName
+  }
+
+  /**
+   * Read submodule information from .gitmodules
+   */
+  def getSubmodules(git: Git, tree: RevTree): List[SubmoduleInfo] = {
+    val repository = git.getRepository
+    getContentFromPath(git, tree, ".gitmodules", true).map { bytes =>
+      (try {
+        val config = new BlobBasedConfig(repository.getConfig(), bytes)
+        config.getSubsections("submodule").asScala.map { module =>
+          val path = config.getString("submodule", module, "path")
+          val url  = config.getString("submodule", module, "url")
+          SubmoduleInfo(module, path, url)
+        }
+      } catch {
+        case e: ConfigInvalidException => {
+          logger.error("Failed to load .gitmodules file for " + repository.getDirectory(), e)
+          Nil
+        }
+      }).toList
+    } getOrElse Nil
+	}
+
+  /**
+   * Get object content of the given path as byte array from the Git repository.
+   *
+   * @param git the Git object
+   * @param revTree the rev tree
+   * @param path the path
+   * @param fetchLargeFile if false then returns None for the large file
+   * @return the byte array of content or None if object does not exist
+   */
+  def getContentFromPath(git: Git, revTree: RevTree, path: String, fetchLargeFile: Boolean): Option[Array[Byte]] = {
+    @scala.annotation.tailrec
+    def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revTree)
+      treeWalk.setRecursive(true)
+      getPathObjectId(path, treeWalk)
+    } flatMap { objectId =>
+      getContentFromId(git, objectId, fetchLargeFile)
+    }
+  }
+
+  /**
+   * Get object content of the given object id as byte array from the Git repository.
+   *
+   * @param git the Git object
+   * @param id the object id
+   * @param fetchLargeFile if false then returns None for the large file
+   * @return the byte array of content or None if object does not exist
+   */
+  def getContentFromId(git: Git, id: ObjectId, fetchLargeFile: Boolean): Option[Array[Byte]] = try {
+    val loader = git.getRepository.getObjectDatabase.open(id)
+    if(fetchLargeFile == false && FileUtil.isLarge(loader.getSize)){
+      None
+    } else {
+      using(git.getRepository.getObjectDatabase){ db =>
+        Some(db.open(id).getBytes)
+      }
+    }
+  } catch {
+    case e: MissingObjectException => None
+  }
+
 }

src/main/scala/util/Keys.scala

@@ -13,12 +13,7 @@ object Keys {
     /**
      * Session key for the logged in account information.
      */
-    val LoginAccount = "LOGIN_ACCOUNT"
-
-    /**
-     * Session key for the redirect URL.
-     */
-    val Redirect = "REDIRECT"
+    val LoginAccount = "loginAccount"
 
     /**
      * Session key for the issue search condition in dashboard.
@@ -47,6 +42,20 @@ object Keys {
 
   }
 
+  object Flash {
+
+    /**
+     * Flash key for the redirect URL.
+     */
+    val Redirect = "redirect"
+
+    /**
+     * Flash key for the information message.
+     */
+    val Info = "info"
+
+  }
+
   /**
    * Define request keys.
    */

src/main/scala/util/LDAPUtil.scala

@@ -3,6 +3,8 @@ package util
 import util.ControlUtil._
 import service.SystemSettingsService
 import com.novell.ldap._
+import java.security.Security
+import org.slf4j.LoggerFactory
 import service.SystemSettingsService.Ldap
 import scala.annotation.tailrec
 
@@ -11,72 +13,98 @@ import scala.annotation.tailrec
  */
 object LDAPUtil {
 
-  private val LDAP_VERSION: Int = 3
+  private val LDAP_VERSION: Int = LDAPConnection.LDAP_V3
+  private val logger = LoggerFactory.getLogger(getClass().getName())
 
   /**
    * Try authentication by LDAP using given configuration.
-   * Returns Right(mailAddress) if authentication is successful, otherwise  Left(errorMessage).
+   * Returns Right(LDAPUserInfo) if authentication is successful, otherwise  Left(errorMessage).
    */
-  def authenticate(ldapSettings: Ldap, userName: String, password: String): Either[String, String] = {
+  def authenticate(ldapSettings: Ldap, userName: String, password: String): Either[String, LDAPUserInfo] = {
     bind(
-      ldapSettings.host,
-      ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
-      ldapSettings.bindDN.getOrElse(""),
-      ldapSettings.bindPassword.getOrElse("")
-    ) match {
-      case Some(conn) => {
-        withConnection(conn) { conn =>
-          findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
-            case Some(userDN) => userAuthentication(ldapSettings, userDN, password)
-            case None => Left("User does not exist.")
-          }
-        }
+      host     = ldapSettings.host,
+      port     = ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
+      dn       = ldapSettings.bindDN.getOrElse(""),
+      password = ldapSettings.bindPassword.getOrElse(""),
+      tls      = ldapSettings.tls.getOrElse(false),
+      keystore = ldapSettings.keystore.getOrElse(""),
+      error    = "System LDAP authentication failed."
+    ){ conn =>
+      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
+        case Some(userDN) => userAuthentication(ldapSettings, userDN, userName, password)
+        case None         => Left("User does not exist.")
       }
-      case None => Left("System LDAP authentication failed.")
     }
   }
 
-  private def userAuthentication(ldapSettings: Ldap, userDN: String, password: String): Either[String, String] = {
+  private def userAuthentication(ldapSettings: Ldap, userDN: String, userName: String, password: String): Either[String, LDAPUserInfo] = {
     bind(
-      ldapSettings.host,
-      ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
-      userDN,
-      password
-    ) match {
-      case Some(conn) => {
-        withConnection(conn) { conn =>
-          findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
-            case Some(mailAddress) => Right(mailAddress)
-            case None => Left("Can't find mail address.")
-          }
-        }
+      host     = ldapSettings.host,
+      port     = ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
+      dn       = userDN,
+      password = password,
+      tls      = ldapSettings.tls.getOrElse(false),
+      keystore = ldapSettings.keystore.getOrElse(""),
+      error    = "User LDAP Authentication Failed."
+    ){ conn =>
+      findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
+        case Some(mailAddress) => Right(LDAPUserInfo(
+          userName    = userName,
+          fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
+            findFullName(conn, userDN, fullNameAttribute)
+          }.getOrElse(userName),
+          mailAddress = mailAddress))
+        case None => Left("Can't find mail address.")
       }
-      case None => Left("User LDAP Authentication Failed.")
     }
   }
 
-  private def bind(host: String, port: Int, dn: String, password: String): Option[LDAPConnection] = {
-    val conn: LDAPConnection = new LDAPConnection
+  private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String)
+                  (f: LDAPConnection => Either[String, A]): Either[String, A] = {
+    if (tls) {
+      // Dynamically set Sun as the security provider
+      Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider())
+
+      if (keystore.compareTo("") != 0) {
+        // Dynamically set the property that JSSE uses to identify
+        // the keystore that holds trusted root certificates
+        System.setProperty("javax.net.ssl.trustStore", keystore)
+      }
+    }
+
+    val conn: LDAPConnection = new LDAPConnection(new LDAPJSSEStartTLSFactory())
     try {
+      // Connect to the server
       conn.connect(host, port)
+
+      if (tls) {
+        // Secure the connection
+        conn.startTLS()
+      }
+
+      // Bind to the server
       conn.bind(LDAP_VERSION, dn, password.getBytes)
-      Some(conn)
+
+      // Execute a given function and returns a its result
+      f(conn)
+
     } catch {
       case e: Exception => {
-        if (conn.isConnected) conn.disconnect()
-        None
+        // Provide more information if something goes wrong
+        logger.info("" + e)
+
+        if (conn.isConnected) {
+          conn.disconnect()
+        }
+        // Returns an error message
+        Left(error)
       }
     }
   }
 
-  private def withConnection[T](conn: LDAPConnection)(f: LDAPConnection => T): T = {
-    try {
-      f(conn)
-    } finally {
-      conn.disconnect()
-    }
-  }
-
+  /**
+   * Search a specified user and returns userDN if exists.
+   */
   private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String): Option[String] = {
     @tailrec
     def getEntries(results: LDAPSearchResults, entries: List[Option[LDAPEntry]] = Nil): List[LDAPEntry] = {
@@ -97,8 +125,18 @@ object LDAPUtil {
 
   private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
     defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
-      optionIf (results.hasMore) {
+      if(results.hasMore) {
         Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
-      }
+      } else None
     }
+
+  private def findFullName(conn: LDAPConnection, userDN: String, nameAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](nameAttribute), false)){ results =>
+      if(results.hasMore) {
+        Option(results.next.getAttribute(nameAttribute)).map(_.getStringValue)
+      } else None
+    }
+
+  case class LDAPUserInfo(userName: String, fullName: String, mailAddress: String)
+
 }

src/main/scala/util/Notifier.scala

@@ -91,6 +91,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
                 .foreach { case (address, name) =>
                   email.setFrom(address, name)
                 }
+              email.setCharset("UTF-8")
               email.setSubject(subject)
               email.setHtmlMsg(msg)
 

src/main/scala/util/StringUtil.scala

@@ -3,6 +3,8 @@ package util
 import java.net.{URLDecoder, URLEncoder}
 import org.mozilla.universalchardet.UniversalDetector
 import util.ControlUtil._
+import org.apache.commons.io.input.BOMInputStream
+import org.apache.commons.io.IOUtils
 
 object StringUtil {
 
@@ -27,7 +29,12 @@ object StringUtil {
   def escapeHtml(value: String): String =
     value.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")
 
-  def convertFromByteArray(content: Array[Byte]): String = new String(content, detectEncoding(content))
+  /**
+   * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]].
+   * And if given bytes contains UTF-8 BOM, it's removed from returned string.
+   */
+  def convertFromByteArray(content: Array[Byte]): String =
+    IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content))
 
   def detectEncoding(content: Array[Byte]): String =
     defining(new UniversalDetector(null)){ detector =>
@@ -38,4 +45,23 @@ object StringUtil {
         case e    => e
       }
     }
+
+  /**
+   * Extract issue id like ```#issueId``` from the given message.
+   *
+   *@param message the message which may contains issue id
+   * @return the iterator of issue id
+   */
+  def extractIssueId(message: String): Iterator[String] =
+    "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2))
+
+  /**
+   * Extract close issue id like ```close #issueId ``` from the given message.
+   *
+   * @param message the message which may contains close command
+   * @return the iterator of issue id
+   */
+  def extractCloseId(message: String): Iterator[String] =
+    "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r.findAllIn(message).matchData.map(_.group(1))
+
 }

src/main/scala/util/Validations.scala

@@ -1,6 +1,7 @@
 package util
 
 import jp.sf.amateras.scalatra.forms._
+import org.scalatra.i18n.Messages
 
 trait Validations {
 
@@ -8,7 +9,7 @@ trait Validations {
    * Constraint for the identifier such as user name, repository name or page name.
    */
   def identifier: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       if(!value.matches("^[a-zA-Z0-9\\-_.]+$")){
         Some(s"${name} contains invalid character.")
       } else if(value.startsWith("_") || value.startsWith("-")){
@@ -25,7 +26,7 @@ trait Validations {
    */
   def date(constraints: Constraint*): SingleValueType[java.util.Date] =
     new SingleValueType[java.util.Date]((pattern("\\d{4}-\\d{2}-\\d{2}") +: constraints): _*){
-      def convert(value: String): java.util.Date = new java.text.SimpleDateFormat("yyyy-MM-dd").parse(value)
+      def convert(value: String, messages: Messages): java.util.Date = new java.text.SimpleDateFormat("yyyy-MM-dd").parse(value)
     }
 
 }

src/main/scala/view/AvatarImageProvider.scala

@@ -16,8 +16,8 @@ trait AvatarImageProvider { self: RequestCache =>
     val src = if(mailAddress.isEmpty){
       // by user name
       getAccountByUserName(userName).map { account =>
-        if(account.image.isEmpty && getSystemSettings().gravatar){
-          s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+        if(account.image.isEmpty && context.settings.gravatar){
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
         } else {
           s"""${context.path}/${account.userName}/_avatar"""
         }
@@ -27,14 +27,14 @@ trait AvatarImageProvider { self: RequestCache =>
     } else {
       // by mail address
       getAccountByMailAddress(mailAddress).map { account =>
-        if(account.image.isEmpty && getSystemSettings().gravatar){
-          s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+        if(account.image.isEmpty && context.settings.gravatar){
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
         } else {
           s"""${context.path}/${account.userName}/_avatar"""
         }
       } getOrElse {
-        if(getSystemSettings().gravatar){
-          s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
+        if(context.settings.gravatar){
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
         } else {
           s"""${context.path}/_unknown/_avatar"""
         }

src/main/scala/view/LinkConverter.scala

@@ -14,22 +14,21 @@ trait LinkConverter { self: RequestCache =>
       // escape HTML tags
       .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
       // convert issue id to link
-      .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m =>
+      .replaceBy(("(?<=(^|\\W))" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
         getIssue(repository.owner, repository.name, m.group(2)) match {
           case Some(issue) if(issue.isPullRequest)
-                       => Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
-          case Some(_) => Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
-          case None    => Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
-
+                       => Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(2)}">#${m.group(2)}</a>""")
+          case Some(_) => Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>""")
+          case None    => Some(s"""#${m.group(2)}""")
         }
       }
       // convert @username to link
-      .replaceBy("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)".r){ m =>
+      .replaceBy("(?<=(^|\\W))@([a-zA-Z0-9\\-_]+)(?=(\\W|$))".r){ m =>
         getAccountByUserName(m.group(2)).map { _ =>
-          s"""${m.group(1)}<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>${m.group(3)}"""
+          s"""<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>"""
         }
       }
       // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
+      .replaceAll("(?<=(^|\\W))([a-f0-9]{40})(?=(\\W|$))", s"""<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>""")
   }
 }

src/main/scala/view/Markdown.scala

@@ -7,6 +7,8 @@ import org.parboiled.common.StringUtils
 import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
+import java.text.Normalizer
+import java.util.Locale
 import scala.collection.JavaConverters._
 import service.{RequestCache, WikiService}
 
@@ -19,11 +21,11 @@ object Markdown {
              enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
     // escape issue id
     val source = if(enableRefsLink){
-      markdown.replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1issue:$2$3")
+      markdown.replaceAll("(?<=(\\W|^))#(\\d+)(?=(\\W|$))", "issue:$2")
     } else markdown
 
     val rootNode = new PegDownProcessor(
-      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES
+      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES | Extensions.HARDWRAPS
     ).parseMarkdown(source.toCharArray)
 
     new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink).toHtml(rootNode)
@@ -43,7 +45,7 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
           (text, text)
         }
 
-        val url = repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
+        val url = repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
 
         if(getWikiPage(repository.owner, repository.name, page).isDefined){
           new Rendering(url, label)
@@ -102,7 +104,7 @@ class GitBucketHtmlSerializer(
     if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")){
       url
     } else {
-      repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
+      repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
     }
   }
 
@@ -110,6 +112,21 @@ class GitBucketHtmlSerializer(
     printer.print(' ').print(name).print('=').print('"').print(value).print('"')
   }
 
+  private def printHeaderTag(node: HeaderNode): Unit = {
+    val tag = s"h${node.getLevel}"
+    val headerTextString = printChildrenToString(node)
+    val anchorName = GitBucketHtmlSerializer.generateAnchorName(headerTextString)
+    printer.print(s"""<$tag class="markdown-head">""")
+    printer.print(s"""<a class="markdown-anchor-link" href="#$anchorName"></a>""")
+    printer.print(s"""<a class="markdown-anchor" name="$anchorName"></a>""")
+    visitChildren(node)
+    printer.print(s"</$tag>")
+  }
+
+  override def visit(node: HeaderNode): Unit = {
+    printHeaderTag(node)
+  }
+
   override def visit(node: TextNode): Unit =  {
     // convert commit id and username to link.
     val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText
@@ -120,5 +137,16 @@ class GitBucketHtmlSerializer(
       printWithAbbreviations(text)
     }
   }
+}
 
-}
+object GitBucketHtmlSerializer {
+
+  private val Whitespace = "[\\s]".r
+
+  def generateAnchorName(text: String): String = {
+    val noWhitespace = Whitespace.replaceAllIn(text, "-")
+    val normalized = Normalizer.normalize(noWhitespace, Normalizer.Form.NFD)
+    val noSpecialChars = StringUtil.urlEncode(normalized)
+    noSpecialChars.toLowerCase(Locale.ENGLISH)
+  }
+}

src/main/scala/view/helpers.scala

@@ -35,12 +35,16 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
 
   /**
-   * Returns <img> which displays the avatar icon.
-   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   * Returns <img> which displays the avatar icon for the given user name.
+   * This method looks up Gravatar if avatar icon has not been configured in user settings.
    */
   def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html =
     getAvatarImageHtml(userName, size, "", tooltip)
 
+  /**
+   * Returns <img> which displays the avatar icon for the given mail address.
+   * This method looks up Gravatar if avatar icon has not been configured in user settings.
+   */
   def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
     getAvatarImageHtml(commit.committer, size, commit.mailAddress)
 
@@ -57,7 +61,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
       value
     }
 
-  import scala.util.matching.Regex
   import scala.util.matching.Regex._
   implicit class RegexReplaceString(s: String) {
     def replaceAll(pattern: String, replacer: (Match) => String): String = {
@@ -65,6 +68,9 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     }
   }
 
+  /**
+   * Convert link notations in the activity message.
+   */
   def activityMessage(message: String)(implicit context: app.Context): Html =
     Html(message
       .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")
@@ -72,7 +78,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
       .replaceAll("\\[repo:([^\\s]+?)/([^\\s]+?)\\]"             , s"""<a href="${context.path}/$$1/$$2\">$$1/$$2</a>""")
       .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]", (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/tree/${encodeRefName(m.group(3))}">${m.group(3)}</a>""")
       .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]"   , (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/tree/${encodeRefName(m.group(3))}">${m.group(3)}</a>""")
-      .replaceAll("\\[user:([^\\s]+?)\\]"                        , s"""<a href="${context.path}/$$1">$$1</a>""")
+      .replaceAll("\\[user:([^\\s]+?)\\]"                        , (m: Match) => user(m.group(1)).body)
     )
 
   /**
@@ -101,14 +107,32 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   def assets(implicit context: app.Context): String = s"${context.path}/assets"
 
   /**
-   * Generates the link to the account page.
+   * Generates the text link to the account page.
+   * If user does not exist or disabled, this method returns user name as text without link.
    */
-  def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
-    getAccountByMailAddress(mailAddress).map { account =>
-      Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${userName}</a>""")
-    } getOrElse Html(userName)
-  }
+  def user(userName: String, mailAddress: String = "", styleClass: String = "")(implicit context: app.Context): Html =
+    userWithContent(userName, mailAddress, styleClass)(Html(userName))
 
+  /**
+   * Generates the avatar link to the account page.
+   * If user does not exist or disabled, this method returns avatar image without link.
+   */
+  def avatarLink(userName: String, size: Int, mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html =
+    userWithContent(userName, mailAddress)(avatar(userName, size, tooltip))
+
+  private def userWithContent(userName: String, mailAddress: String = "", styleClass: String = "")(content: Html)(implicit context: app.Context): Html =
+    (if(mailAddress.isEmpty){
+      getAccountByUserName(userName)
+    } else {
+      getAccountByMailAddress(mailAddress)
+    }).map { account =>
+      Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${content}</a>""")
+    } getOrElse content
+
+
+  /**
+   * Test whether the given Date is past date.
+   */
   def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime
 
   /**

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

@@ -1,66 +1,67 @@
-@(account: Option[model.Account], info: Option[Any])(implicit context: app.Context)
+@(account: model.Account, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main((if(account.isDefined) "Edit your profile" else "Create your account")){
-  @if(account.isDefined){
-    <h3>Edit your profile</h3>
-  } else {
-    <h3>Create your account</h3>
-  }
-  @helper.html.information(info)
-  <form action="@if(account.isDefined){@url(account.get.userName)/_edit}else{@path/register}" method="POST" validate="true">
-    <div class="row-fluid">
-      <div class="span6">
-        @if(account.isEmpty){
-          <fieldset>
-            <label for="userName" class="strong">Username:</label>
-            <input type="text" name="userName" id="userName" value=""/>
-            <span id="error-userName" class="error"></span>
-          </fieldset>
-        }
-        @if(account.map(_.password.nonEmpty).getOrElse(true)){
-          <fieldset>
-            <label for="password" class="strong">
-              Password
-              @if(account.nonEmpty){
-                (input to change password)
-              }
-              :
-            </label>
-            <input type="password" name="password" id="password" value=""/>
-            <span id="error-password" class="error"></span>
-          </fieldset>
-        }
-        <fieldset>
-          <label for="fullName" class="strong">Full Name:</label>
-          <input type="text" name="fullName" id="fullName" value="@account.map(_.fullName)"/>
-          <span id="error-fullName" class="error"></span>
-        </fieldset>
-        <fieldset>
-          <label for="mailAddress" class="strong">Mail Address:</label>
-          <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
-          <span id="error-mailAddress" class="error"></span>
-        </fieldset>
-        <fieldset>
-          <label for="url" class="strong">URL (optional):</label>
-          <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
-          <span id="error-url" class="error"></span>
-        </fieldset>
-      </div>
-      <div class="span6">
-        <fieldset>
-          <label for="avatar" class="strong">Image (optional):</label>
-          @helper.html.uploadavatar(account)
-        </fieldset>
+@html.main("Edit your profile"){
+<div class="row-fluid">
+  <div class="span3">
+    @menu("profile", settings.ssh)
+  </div>
+  <div class="span9">
+    @helper.html.information(info)
+    <form action="@url(account.userName)/_edit" method="POST" validate="true">
+    <div class="box">
+      <div class="box-header">Profile</div>
+      <div class="box-content">
+        <div class="row-fluid">
+          <div class="span6">
+            @if(account.password.nonEmpty){
+              <fieldset>
+                <label for="password" class="strong">
+                  Password (input to change password):
+                </label>
+                <input type="password" name="password" id="password" value=""/>
+                <span id="error-password" class="error"></span>
+              </fieldset>
+            }
+            <fieldset>
+              <label for="fullName" class="strong">Full Name:</label>
+              <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
+              <span id="error-fullName" class="error"></span>
+            </fieldset>
+            <fieldset>
+              <label for="mailAddress" class="strong">Mail Address:</label>
+              <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
+              <span id="error-mailAddress" class="error"></span>
+            </fieldset>
+            <fieldset>
+              <label for="url" class="strong">URL (optional):</label>
+              <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
+              <span id="error-url" class="error"></span>
+            </fieldset>
+          </div>
+          <div class="span6">
+            <fieldset>
+              <label for="avatar" class="strong">Image (optional):</label>
+              @helper.html.uploadavatar(Some(account))
+            </fieldset>
+          </div>
+        </div>
+        <div style="margin-top: 20px;">
+          <div class="pull-right">
+            <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+          </div>
+          <input type="submit" class="btn btn-success" value="Save"/>
+          <a href="@url(account.userName)" class="btn">Cancel</a>
+        </div>
       </div>
     </div>
-    <fieldset class="margin">
-      @if(account.isDefined){
-        <input type="submit" class="btn btn-success" value="Save"/>
-        <a href="@url(account.get.userName)" class="btn">Cancel</a>
-      } else {
-        <input type="submit" class="btn btn-success" value="Create account"/>
-      }
-    </fieldset>
   </form>
+</div>
 }
+<script>
+$(function(){
+  $('#delete').click(function(){
+    return confirm('Once you delete your account, there is no going back.\nAre you sure?');
+  });
+});
+</script>

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

@@ -0,0 +1,140 @@
+@(account: Option[model.Account], members: List[model.GroupMember])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(if(account.isEmpty) "Create group" else "Edit group"){
+<div>
+  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
+      <div class="row-fluid">
+        <div class="span5">
+          <fieldset>
+            <label for="groupName" class="strong">Group name</label>
+            <div>
+              <span id="error-groupName" class="error"></span>
+            </div>
+            <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+          </fieldset>
+          <fieldset>
+            <label class="strong">URL (Optional)</label>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
+            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
+          </fieldset>
+          <fieldset>
+            <label for="avatar" class="strong">Image (Optional)</label>
+            @helper.html.uploadavatar(account)
+          </fieldset>
+        </div>
+        <div class="span7">
+          <fieldset>
+            <label class="strong">Members</label>
+            <ul id="member-list" class="collaborator">
+            </ul>
+            @helper.html.account("memberName", 200)
+            <input type="button" class="btn" value="Add" id="addMember"/>
+            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
+            <div>
+              <span class="error" id="error-members"></span>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <fieldset class="margin">
+        @if(account.isDefined){
+          <div class="pull-right">
+            <a href="@url(account.get.userName)/_deletegroup" id="delete" class="btn btn-danger">Delete Group</a>
+          </div>
+        }
+        <input type="submit" class="btn btn-success" value="@if(account.isEmpty){Create Group} else {Update Group}"/>
+        @if(account.isDefined){
+          <a href="@url(account.get.userName)" class="btn">Cancel</a>
+        }
+      </fieldset>
+  </form>
+</div>
+}
+<script>
+$(function(){
+  $('input[type=submit]').click(function(){
+    updateMembers();
+  });
+
+  $('#addMember').click(function(){
+    $('#error-memberName').text('');
+    var userName = $('#memberName').val();
+
+    // check empty
+    if($.trim(userName) == ''){
+      return false;
+    }
+
+    // check duplication
+    var exists = $('#member-list li').filter(function(){
+      return $(this).data('name') == userName;
+    }).length > 0;
+    if(exists){
+      $('#error-memberName').text('User has been already added.');
+      return false;
+    }
+
+    // check existence
+    $.post('@path/admin/users/_usercheck', {
+      'userName': userName
+    }, function(data, status){
+      if(data == 'true'){
+        addMemberHTML(userName, false);
+      } else {
+        $('#error-memberName').text('User does not exist.');
+      }
+    });
+  });
+
+  $(document).on('click', '.remove', function(){
+    $(this).parent().remove();
+  });
+
+  // Don't submit form by ENTER key
+  $('#memberName').keypress(function(e){
+    return !(e.keyCode == 13);
+  });
+
+  $('#delete').click(function(){
+    return confirm('Once you delete this group, there is no going back.\nAre you sure?');
+  });
+
+  @members.map { member =>
+    addMemberHTML('@member.userName', @member.isManager);
+  }
+
+  function addMemberHTML(userName, isManager){
+    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').data('name', userName);
+    if(!isManager){
+      memberButton.addClass('active');
+    }
+    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').data('name', userName);
+    if(isManager){
+      managerButton.addClass('active');
+    }
+
+    $('#member-list').append($('<li>')
+      .data('name', userName)
+      .append($('<div class="btn-group is_manager" data-toggle="buttons-radio">')
+        .append(memberButton)
+        .append(managerButton))
+      .append(' ')
+      .append($('<a>').attr('href', '@path/' + userName).text(userName))
+      .append(' ')
+      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
+  }
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $('button.active').filter(function(i, e){
+        return $(e).data('name') == userName;
+      }).attr('value');
+    }).get().join(',');
+    $('#members').val(members);
+  }
+});
+</script>

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

@@ -1,4 +1,5 @@
-@(account: model.Account, groupNames: List[String], active: String)(body: Html)(implicit context: app.Context)
+@(account: model.Account, groupNames: List[String], active: String,
+  isGroupManager: Boolean = false)(body: Html)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(account.userName){
@@ -41,6 +42,13 @@
               </div>
             </li>
           }
+          @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
+            <li class="pull-right">
+              <div class="button-group">
+                <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
+              </div>
+            </li>
+          }
         </ul>
         @body
       </div>

src/main/twirl/account/members.scala.html

@@ -1,7 +1,7 @@
-@(account: model.Account, members: List[String])(implicit context: app.Context)
+@(account: model.Account, members: List[String], isGroupManager: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@main(account, Nil, "members"){
+@main(account, Nil, "members", isGroupManager){
   @if(members.isEmpty){
     No members
   } else {

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

@@ -0,0 +1,14 @@
+@(active: String, ssh: Boolean)(implicit context: app.Context)
+@import context._
+<div class="box">
+  <ul class="nav nav-tabs nav-stacked side-menu">
+    <li@if(active=="profile"){ class="active"}>
+      <a href="@path/@loginAccount.get.userName/_edit">Profile</a>
+    </li>
+    @if(ssh){
+    <li@if(active=="ssh"){ class="active"}>
+      <a href="@path/@loginAccount.get.userName/_ssh">SSH Keys</a>
+    </li>
+    }
+  </ul>
+</div>

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

@@ -1,7 +1,7 @@
 @(groupNames: List[String])(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@main("Create a New Repository"){
+@html.main("Create a New Repository"){
 <div style="width: 600px; margin: 10px auto;">
   <form id="form" method="post" action="@path/new" validate="true">
     <fieldset>
@@ -30,7 +30,7 @@
     <fieldset class="margin">
       <label class="radio">
         <input type="radio" name="isPrivate" value="false" checked>
-        <span class="strong"><i class="icon-eye-open">&nbsp;</i>&nbsp;Public</span><br>
+        <span class="strong"><img src="@assets/common/images/repo_public.png"/>&nbsp;</i>&nbsp;Public</span><br>
         <div>
           <span>All users and guests can read this repository.</span>
         </div>
@@ -39,7 +39,7 @@
     <fieldset>
       <label class="radio">
         <input type="radio" name="isPrivate" value="true">
-        <span class="strong"><i class="icon-lock">&nbsp;</i>&nbsp;Private</span><br>
+        <span class="strong"><img src="@assets/common/images/repo_private.png"/>&nbsp;</i>&nbsp;Private</span><br>
         <div>
           <span>Only collaborators can read this repository.</span>
         </div>

src/main/twirl/account/register.scala.html

@@ -0,0 +1,48 @@
+@()(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("Create your account"){
+  <h3>Create your account</h3>
+  <form action="@path/register" method="POST" validate="true">
+    <div class="row-fluid">
+      <div class="span6">
+        <fieldset>
+          <label for="userName" class="strong">Username:</label>
+          <input type="text" name="userName" id="userName" value=""/>
+          <span id="error-userName" class="error"></span>
+        </fieldset>
+        <fieldset>
+          <label for="password" class="strong">
+            Password:
+          </label>
+          <input type="password" name="password" id="password" value=""/>
+          <span id="error-password" class="error"></span>
+        </fieldset>
+        <fieldset>
+          <label for="fullName" class="strong">Full Name:</label>
+          <input type="text" name="fullName" id="fullName" value=""/>
+          <span id="error-fullName" class="error"></span>
+        </fieldset>
+        <fieldset>
+          <label for="mailAddress" class="strong">Mail Address:</label>
+          <input type="text" name="mailAddress" id="mailAddress" value=""/>
+          <span id="error-mailAddress" class="error"></span>
+        </fieldset>
+        <fieldset>
+          <label for="url" class="strong">URL (optional):</label>
+          <input type="text" name="url" id="url" style="width: 400px;" value=""/>
+          <span id="error-url" class="error"></span>
+        </fieldset>
+      </div>
+      <div class="span6">
+        <fieldset>
+          <label for="avatar" class="strong">Image (optional):</label>
+          @helper.html.uploadavatar(None)
+        </fieldset>
+      </div>
+    </div>
+    <fieldset class="margin">
+      <input type="submit" class="btn btn-success" value="Create account"/>
+    </fieldset>
+  </form>
+}

src/main/twirl/account/repositories.scala.html

@@ -1,7 +1,9 @@
-@(account: model.Account, groupNames: List[String], repositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
+@(account: model.Account, groupNames: List[String],
+  repositories: List[service.RepositoryService.RepositoryInfo],
+  isGroupManager: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@main(account, groupNames, "repositories"){
+@main(account, groupNames, "repositories", isGroupManager){
   @if(repositories.isEmpty){
     No repositories
   } else {

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

@@ -0,0 +1,45 @@
+@(account: model.Account, sshKeys: List[model.SshKey])(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main("SSH Keys"){
+<div class="row-fluid">
+  <div class="span3">
+    @menu("ssh", settings.ssh)
+  </div>
+  <div class="span9">
+    <div class="box">
+      <div class="box-header">SSH Keys</div>
+      <div class="box-content">
+        @if(sshKeys.isEmpty){
+          No keys
+        }
+        @sshKeys.zipWithIndex.map { case (key, i) =>
+          @if(i != 0){
+            <hr>
+          }
+          <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey))
+          <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
+        }
+      </div>
+    </div>
+    <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+      <div class="box">
+        <div class="box-header">Add an SSH Key</div>
+        <div class="box-content">
+          <fieldset>
+            <label for="title" class="strong">Title</label>
+            <div><span id="error-title" class="error"></span></div>
+            <input type="text" name="title" id="title" style="width: 400px;"/>
+          </fieldset>
+          <fieldset>
+            <label for="publicKey" class="strong">Key</label>
+            <div><span id="error-publicKey" class="error"></span></div>
+            <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
+          </fieldset>
+          <input type="submit" class="btn btn-success" value="Add"/>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
+}

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

@@ -1,5 +1,6 @@
-@(settings: service.SystemSettingsService.SystemSettings, info: Option[Any])(implicit context: app.Context)
+@(info: Option[Any])(implicit context: app.Context)
 @import context._
+@import util.Directory._
 @import view.helpers._
 @html.main("System Settings"){
   @menu("system"){
@@ -8,9 +9,31 @@
       <div class="box">
         <div class="box-header">System Settings</div>
         <div class="box-content">
+          <!--====================================================================-->
+          <!-- GITBUCKET_HOME -->
+          <!--====================================================================-->
+          <label class="strong">GITBUCKET_HOME</label>
+          @GitBucketHome
+          <!--====================================================================-->
+          <!-- Base URL -->
+          <!--====================================================================-->
+          <hr>
+          <label><span class="strong">Base URL</span> (e.g. <code>http://example.com/gitbucket</code>)</label>
+          <fieldset>
+              <div class="controls">
+                <input type="text" name="baseUrl" id="baseUrl" style="width: 400px" value="@settings.baseUrl"/>
+                <span id="error-baseUrl" class="error"></span>
+              </div>
+          </fieldset>
+          <p class="muted">
+            The base URL is used for redirect, notification email, git repository URL box and more.
+            If the base URL is empty, GitBucket generates URL from request information.
+            You can use this property to adjust URL difference between the reverse proxy and GitBucket.
+          </p>
           <!--====================================================================-->
           <!-- Account registration -->
           <!--====================================================================-->
+          <hr>
           <label class="strong">Account registration</label>
           <fieldset>
             <label class="radio">
@@ -34,6 +57,29 @@
             </label>
           </fieldset>
           <!--====================================================================-->
+          <!-- SSH access -->
+          <!--====================================================================-->
+          <hr>
+          <label class="strong">SSH access</label>
+          <fieldset>
+            <label class="checkbox">
+              <input type="checkbox" id="ssh" name="ssh"@if(settings.ssh){ checked}/>
+              Enable SSH access to git repository
+            </label>
+          </fieldset>
+          <div class="form-horizontal ssh">
+            <div class="control-group">
+              <label class="control-label" for="sshPort">SSH Port</label>
+              <div class="controls">
+                <input type="text" id="sshPort" name="sshPort" value="@settings.sshPort"/>
+                <span id="error-sshPort" class="error"></span>
+              </div>
+            </div>
+          </div>
+          <p class="muted">
+            Base URL is required if SSH access is enabled.
+          </p>
+          <!--====================================================================-->
           <!-- Authentication -->
           <!--====================================================================-->
           <hr>
@@ -87,6 +133,13 @@
                 <span id="error-ldap_userNameAttribute" class="error"></span>
               </div>
             </div>
+            <div class="control-group">
+              <label class="control-label" for="ldapFullNameAttribute">Full name attribute</label>
+              <div class="controls">
+                <input type="text" id="ldapFullNameAttribute" name="ldap.fullNameAttribute" value="@settings.ldap.map(_.fullNameAttribute)"/>
+                <span id="error-ldap_fullNameAttribute" class="error"></span>
+              </div>
+            </div>
             <div class="control-group">
               <label class="control-label" for="ldapMailAttribute">Mail address attribute</label>
               <div class="controls">
@@ -94,6 +147,20 @@
                 <span id="error-ldap_mailAttribute" class="error"></span>
               </div>
             </div>
+            <div class="control-group">
+              <div class="controls">
+                <label class="checkbox">
+                  <input type="checkbox" name="ldap.tls"@if(settings.ldap.flatMap(_.tls).getOrElse(false)){ checked}/> Enable TLS
+                </label>
+              </div>
+            </div>
+            <div class="control-group">
+              <label class="control-label" for="ldapBindDN">Keystore</label>
+              <div class="controls">
+                <input type="text" id="ldapKeystore" name="ldap.keystore" value="@settings.ldap.map(_.keystore)"/>
+                <span id="error-ldap_keystore" class="error"></span>
+              </div>
+            </div>
           </div>
           <!--====================================================================-->
           <!-- Notification email -->
@@ -163,6 +230,10 @@
 }
 <script>
 $(function(){
+  $('#ssh').change(function(){
+    $('.ssh input').prop('disabled', !$(this).prop('checked'));
+  }).change();
+
   $('#notification').change(function(){
     $('.notification input').prop('disabled', !$(this).prop('checked'));
   }).change();

src/main/twirl/admin/users/group.scala.html

@@ -1,46 +1,46 @@
-@(account: Option[model.Account], members: List[String])(implicit context: app.Context)
+@(account: Option[model.Account], members: List[model.GroupMember])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main(if(account.isEmpty) "New Group" else "Update Group"){
   @admin.html.menu("users"){
     <form method="POST" action="@if(account.isEmpty){@path/admin/users/_newgroup} else {@path/admin/users/@account.get.userName/_editgroup}" validate="true">
       <div class="row-fluid">
-        <div class="span7">
+        <div class="span5">
           <fieldset>
             <label for="groupName" class="strong">Group name</label>
             <div>
               <span id="error-groupName" class="error"></span>
             </div>
             <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+            @if(account.isDefined){
+              <label for="removed">
+                <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
+                Disable
+              </label>
+            }
           </fieldset>
           <fieldset>
             <label class="strong">URL (Optional)</label>
             <div>
               <span id="error-url" class="error"></span>
             </div>
-            <input type="text" name="url" id="url" style="width: 300px;" value="@account.map(_.url)"/>
+            <input type="text" name="url" id="url" value="@account.map(_.url)"/>
           </fieldset>
           <fieldset>
             <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
-        <div class="span5">
+        <div class="span7">
           <fieldset>
             <label class="strong">Members</label>
-            <ul id="members" class="collaborator">
-              @members.map { userName =>
-                <li data-name="@userName">
-                  <a href="@path/@url(userName)">@userName</a>
-                  <a href="#" class="remove">(remove)</a>
-                </li>
-              }
+            <ul id="member-list" class="collaborator">
             </ul>
             @helper.html.account("memberName", 200)
             <input type="button" class="btn" value="Add" id="addMember"/>
-            <input type="hidden" id="memberNames" name="memberNames" value="@members.mkString(",")"/>
+            <input type="hidden" id="members" name="members" value="@members.map(member => member.userName + ":" + member.isManager).mkString(",")"/>
             <div>
-              <span class="error" id="error-memberName"></span>
+              <span class="error" id="error-members"></span>
             </div>
           </fieldset>
         </div>
@@ -54,6 +54,10 @@
 }
 <script>
 $(function(){
+  $('input[type=submit]').click(function(){
+    updateMembers();
+  });
+
   $('#addMember').click(function(){
     $('#error-memberName').text('');
     var userName = $('#memberName').val();
@@ -64,7 +68,7 @@ $(function(){
     }
 
     // check duplication
-    var exists = $('#members li').filter(function(){
+    var exists = $('#member-list li').filter(function(){
       return $(this).data('name') == userName;
     }).length > 0;
     if(exists){
@@ -77,19 +81,7 @@ $(function(){
       'userName': userName
     }, function(data, status){
       if(data == 'true'){
-        // add member
-        $('#members').append($('<li>')
-          .data('name', userName)
-          .append($('<a>').attr('href', '@path/' + userName).text(userName))
-          .append(' ')
-          .append($('<a>').attr('href', '#').addClass('remove').text('(remove)')));
-        $('#memberName').val('');
-
-        // update hidden value
-        var userNames = $('#members li').map(function(i, e){
-          return $(e).data('name');
-        }).get().join(',');
-        $('#memberNames').val(userNames);
+        addMemberHTML(userName, false);
       } else {
         $('#error-memberName').text('User does not exist.');
       }
@@ -97,20 +89,47 @@ $(function(){
   });
 
   $(document).on('click', '.remove', function(){
-    // remove member
     $(this).parent().remove();
-
-    // update hidden value
-    var userNames = $('#members li').map(function(i, e){
-      return $(e).data('name');
-    }).get().join(',');
-    $('#memberNames').val(userNames);
   });
 
   // Don't submit form by ENTER key
   $('#memberName').keypress(function(e){
-    console.log(e.keyCode);
     return !(e.keyCode == 13);
   });
+
+  @members.map { member =>
+    addMemberHTML('@member.userName', @member.isManager);
+  }
+
+  function addMemberHTML(userName, isManager){
+    var memberButton = $('<button type="button" class="btn btn-default btn-mini" value="false">Member</button>').data('name', userName);
+    if(!isManager){
+      memberButton.addClass('active');
+    }
+    var managerButton = $('<button type="button" class="btn btn-default btn-mini" value="true">Manager</button>').data('name', userName);
+    if(isManager){
+      managerButton.addClass('active');
+    }
+
+    $('#member-list').append($('<li>')
+      .data('name', userName)
+      .append($('<div class="btn-group is_manager" data-toggle="buttons-radio">')
+        .append(memberButton)
+        .append(managerButton))
+      .append(' ')
+      .append($('<a>').attr('href', '@path/' + userName).text(userName))
+      .append(' ')
+      .append($('<a href="#" class="remove pull-right">(remove)</a>')));
+  }
+
+  function updateMembers(){
+    var members = $('#member-list li').map(function(i, e){
+      var userName = $(e).data('name');
+      return userName + ':' + $('button.active').filter(function(i, e){
+        return $(e).data('name') == userName;
+      }).attr('value');
+    }).get().join(',');
+    $('#members').val(members);
+  }
 });
 </script>

src/main/twirl/admin/users/list.scala.html

@@ -1,16 +1,20 @@
-@(users: List[model.Account], members: Map[String, List[String]])(implicit context: app.Context)
+@(users: List[model.Account], members: Map[String, List[String]], includeRemoved: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @html.main("Manage Users"){
   @admin.html.menu("users"){
-    <div style="text-align: right; margin-bottom: 4px;">
+    <div class="pull-right" style="margin-bottom: 4px;">
       <a href="@path/admin/users/_newuser" class="btn">New User</a>
       <a href="@path/admin/users/_newgroup" class="btn">New Group</a>
     </div>
+    <label for="includeRemoved">
+      <input type="checkbox" id="includeRemoved" name="includeRemoved" @if(includeRemoved){checked}/>
+      Include removed users
+    </label>
     <table class="table table-bordered table-hover">
       @users.map { account =>
         <tr>
-          <td>
+          <td @if(account.isRemoved){style="background-color: #dddddd;"}>
             <div class="pull-right">
               @if(account.isGroupAccount){
                 <a href="@path/admin/users/@account.userName/_editgroup">Edit</a>
@@ -57,4 +61,11 @@
       }
     </table>
   }
-}
+}
+<script>
+$(function(){
+  $('#includeRemoved').click(function(){
+    location.href = '@path/admin/users?includeRemoved=' + this.checked;
+  });
+});
+</script>

src/main/twirl/admin/users/user.scala.html

@@ -11,6 +11,12 @@
               <span id="error-userName" class="error"></span>
             </div>
             <input type="text" name="userName" id="userName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
+            @if(account.isDefined){
+              <label for="removed">
+                <input type="checkbox" name="removed" id="removed" value="true" @if(account.get.isRemoved){checked}/>
+                Disable
+              </label>
+            }
           </fieldset>
           @if(account.map(_.password.nonEmpty).getOrElse(true)){
             <fieldset>

src/main/twirl/header.scala.html

@@ -6,16 +6,19 @@
   <div class="pull-right">
     <div class="input-prepend">
       <a href="@path/@repository.owner/@repository.name/fork" class="btn" style="margin-bottom: 10px;">Fork</a>
-      <span class="add-on"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
+      <span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
     </div>
   </div>
 }
 <div class="head">
   @if(repository.repository.isPrivate){
-      <i class="icon-lock"></i>
-  }
-  @if(!repository.repository.isPrivate){
-      <i class="icon-eye-open"></i>
+  <img src="@assets/common/images/repo_private_lg.png"/>
+  } else {
+    @if(repository.repository.originUserName.isDefined){
+      <img src="@assets/common/images/repo_fork_lg.png"/>
+    } else {
+      <img src="@assets/common/images/repo_public_lg.png"/>
+    }
   }
   <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
   
@@ -27,6 +30,9 @@
     }
   }
 </div>
+@repository.repository.description.map { description =>
+  <p>@description</p>
+}
 <table class="global-nav box-header">
   <tr>
     <th class="box-header@if(active=="code"){ active}">
@@ -50,7 +56,7 @@
     <th class="box-header@if(active=="network"){ active}">
       <a href="@url(repository)/network/members">Network</a>
     </th>
-    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || loginAccount.get.userName == repository.owner)){
+    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
     <th class="box-header@if(active=="settings"){ active}">
       <a href="@url(repository)/settings">Settings</a>
     </th>

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

@@ -1,5 +1,5 @@
-@(id: String, value: String)(html: Html)
-<div class="input-append">
+@(id: String, value: String, prepend: Boolean = false)(html: Html)
+<div class="input-append@if(prepend){ input-prepend}">
   @html
   <span id="@id" class="add-on btn" data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
 </div>

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

@@ -1,4 +1,4 @@
-@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "")(body: Html)
+@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "", right: Boolean = false)(body: Html)
 <div class="btn-group"@if(style.nonEmpty){ style="@style"}>
   <button class="btn dropdown-toggle@if(mini){ btn-mini}" data-toggle="dropdown">
     @if(value.isEmpty){
@@ -11,7 +11,7 @@
     }
     <span class="caret"></span>
   </button>
-  <ul class="dropdown-menu">
+  <ul class="dropdown-menu@if(right){ pull-right}">
     @body
   </ul>
 </div>

src/main/twirl/index.scala.html

@@ -1,6 +1,5 @@
 @(activities: List[model.Activity],
   recentRepositories: List[service.RepositoryService.RepositoryInfo],
-  systemSettings: service.SystemSettingsService.SystemSettings,
   userRepositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
 @import context._
 @import view.helpers._
@@ -12,7 +11,7 @@
   </div>
   <div class="span4">
     @if(loginAccount.isEmpty){
-      @signinform(systemSettings)
+      @signinform(settings)
     } else {
       <table class="table table-bordered">
         <tr>
@@ -32,10 +31,13 @@
             <tr>
               <td>
                 @if(repository.repository.isPrivate){
-                  <i class="icon-lock"></i>
-                }
-                @if(!repository.repository.isPrivate){
-                  <i class="icon-eye-open"></i>
+                  <img src="@assets/common/images/repo_private.png"/>
+                } else {
+                  @if(repository.repository.originUserName.isDefined){
+                    <img src="@assets/common/images/repo_fork.png"/>
+                  } else {
+                    <img src="@assets/common/images/repo_public.png"/>
+                  }
                 }
                 @if(repository.owner == loginAccount.get.userName){
                   <a href="@url(repository)"><span class="strong">@repository.name</span></a>
@@ -64,10 +66,13 @@
           <tr>
             <td>
               @if(repository.repository.isPrivate){
-              <i class="icon-lock"></i>
-              }
-              @if(!repository.repository.isPrivate){
-              <i class="icon-eye-open"></i>
+                <img src="@assets/common/images/repo_private.png"/>
+              } else {
+                @if(repository.repository.originUserName.isDefined){
+                  <img src="@assets/common/images/repo_fork.png"/>
+                } else {
+                  <img src="@assets/common/images/repo_public.png"/>
+                }
               }
               <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
             </td>

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

@@ -6,15 +6,21 @@
 @import context._
 @import view.helpers._
 @comments.map { comment =>
-  @if(comment.action != "close" && comment.action != "reopen"){
+  @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
     <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
     <div class="box issue-comment-box" id="comment-@comment.commentId">
       <div class="box-header-small">
         <i class="icon-comment"></i>
-        <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> commented
+        @user(comment.commentedUserName, styleClass="username strong")
+        @if(comment.action == "comment"){
+          commented
+        } else {
+          @if(pullreq.isEmpty){ referenced the issue } else { referenced the pull request }
+        }
         <span class="pull-right">
           @datetime(comment.registeredDate)
-          @if(comment.action != "commit" && comment.action != "merge" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
+          @if(comment.action != "commit" && comment.action != "merge" && comment.action != "refer" &&
+                (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
             <a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil"></i></a>&nbsp;
             <a href="#" data-comment-id="@comment.commentId"><i class="icon-remove-circle"></i></a>
           }
@@ -27,7 +33,13 @@
             @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true)
           }
         } else {
-          @markdown(comment.content, repository, false, true)
+          @if(comment.action == "refer"){
+            @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
+              <strong><a href="@path/@repository.owner/@repository.name/issues/@issueId">Issue #@issueId</a>: @rest.mkString(":")</strong>
+            }
+          } else {
+            @markdown(comment.content, repository, false, true)
+          }
         }
       </div>
     </div>
@@ -36,11 +48,11 @@
     <div class="small" style="margin-top: 10px; margin-bottom: 10px;">
       <span class="label label-info">Merged</span>
       @avatar(comment.commentedUserName, 20)
-      <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> merged commit <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code>
+      @user(comment.commentedUserName, styleClass="username strong") merged commit <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code> into
       @if(pullreq.get.requestUserName == repository.owner){
-        <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span> to <span class="label label-info monospace">@pullreq.map(_.branch)</span>
+        <span class="label label-info monospace">@pullreq.map(_.branch)</span> from <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span>
       } else {
-        <span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span> to <span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span>
+        <span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span> to <span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span>
       }
       @datetime(comment.registeredDate)
     </div>
@@ -50,9 +62,9 @@
       <span class="label label-important">Closed</span>
       @avatar(comment.commentedUserName, 20)
       @if(issue.isPullRequest){
-        <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the pull request @datetime(comment.registeredDate)
+        @user(comment.commentedUserName, styleClass="username strong") closed the pull request @datetime(comment.registeredDate)
       } else {
-        <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
+        @user(comment.commentedUserName, styleClass="username strong") closed the issue @datetime(comment.registeredDate)
       }
     </div>
   }
@@ -60,7 +72,14 @@
     <div class="small issue-comment-action">
       <span class="label label-success">Reopened</span>
       @avatar(comment.commentedUserName, 20)
-      <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
+      @user(comment.commentedUserName, styleClass="username strong") reopened the issue @datetime(comment.registeredDate)
+    </div>
+  }
+  @if(comment.action == "delete_branch"){
+    <div class="small issue-comment-action">
+      <span class="label">Deleted</span>
+      @avatar(comment.commentedUserName, 20)
+      @user(comment.commentedUserName, styleClass="username strong") deleted the <span class="label label-info monospace">@pullreq.map(_.requestBranch)</span> branch @datetime(comment.registeredDate)
     </div>
   }
 }

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

@@ -33,7 +33,7 @@
                 <input type="hidden" name="milestoneId" value=""/>
                 @helper.html.dropdown() {
                   <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-                  @milestones.map { milestone =>
+                  @milestones.filter(_.closedDate.isEmpty).map { milestone =>
                     <li>
                       <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
                         <i class="icon-while"></i> @milestone.title

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

@@ -2,15 +2,17 @@
 @import context._
 <span id="error-edit-content-@commentId" class="error"></span>
 <textarea style="width: 680px; height: 100px;" id="edit-content-@commentId">@content</textarea>
-<input type="button" class="btn btn-small" value="Update Comment"/>
-<span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
+<div>
+  <input type="button" id="update-comment-@commentId" class="btn btn-small" value="Update Comment"/>
+  <input type="button" id="cancel-comment-@commentId" class="btn btn-small btn-danger pull-right" value="Cancel"/>
+</div>
 <script>
 $(function(){
   var callback = function(data){
     $('#commentContent-@commentId').empty().html(data.content);
   };
 
-  $('#commentContent-@commentId input.btn').click(function(){
+  $('#update-comment-@commentId').click(function(){
     $.ajax({
       url: '@path/@owner/@repository/issue_comments/edit/@commentId',
       type: 'POST',
@@ -25,7 +27,7 @@ $(function(){
     });
   });
 
-  $('#commentContent-@commentId a.btn').click(function(){
+  $('#cancel-comment-@commentId').click(function(){
     $.get('@path/@owner/@repository/issue_comments/_data/@commentId', callback);
     return false;
   });

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

@@ -3,8 +3,10 @@
 <span id="error-edit-title" class="error"></span>
 <input type="text" style="width: 680px;" id="edit-title" value="@title"/>
 <textarea style="width: 680px; height: 100px; max-height: 300px;" id="edit-content">@content.getOrElse("")</textarea>
-<input type="button" class="btn btn-small" value="Update Issue"/>
-<span class="pull-right"><a class="btn btn-small btn-danger" href="#">Cancel</a></span>
+<div>
+  <input type="button" id="update" class="btn btn-small" value="Update Issue"/>
+  <input type="button" id="cancel" class="btn btn-small btn-danger pull-right" value="Cancel"/>
+</div>
 <script>
 $(function(){
   $('#edit-content').elastic();
@@ -14,7 +16,7 @@ $(function(){
     $('#issueContent').empty().html(data.content);
   };
 
-  $('#issueContent input.btn').click(function(){
+  $('#update').click(function(){
     $.ajax({
       url: '@path/@owner/@repository/issues/edit/@issueId',
       type: 'POST',
@@ -29,7 +31,7 @@ $(function(){
     });
   });
 
-  $('#issueContent a.btn').click(function(){
+  $('#cancel').click(function(){
     $.get('@path/@owner/@repository/issues/_data/@issueId', callback);
     return false;
   });

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

@@ -33,51 +33,7 @@
         }
       </div>
       <hr/>
-      <div style="margin-bottom: 8px;">
-      <span class="strong">Labels</span>
-      @if(hasWritePermission){
-        <div class="pull-right">
-          @helper.html.dropdown() {
-            @labels.map { label =>
-              <li>
-                <a href="#" class="toggle-label" data-label-id="@label.labelId">
-                  @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
-                  <span class="label" style="background-color: #@label.color;">&nbsp;</span>
-                  @label.labelName
-                </a>
-              </li>
-            }
-          }
-        </div>
-      }
-      </div>
-      <ul class="label-list nav nav-pills nav-stacked">
-        @labellist(issueLabels)
-      </ul>
+      @issues.html.labels(issue, issueLabels, labels, hasWritePermission, repository)
     </div>
   </div>
 }
-<script>
-$(function(){
-  $('a.toggle-label').click(function(){
-    var path, icon;
-    var i = $(this).children('i');
-    if(i.hasClass('icon-ok')){
-      path = 'delete';
-      icon = 'icon-white';
-    } else {
-      path = 'new';
-      icon = 'icon-ok';
-    }
-    $.post('@url(repository)/issues/@issue.issueId/label/' + path,
-    {
-      labelId : $(this).data('label-id')
-    },
-    function(data){
-      i.removeClass().addClass(icon);
-      $('ul.label-list').empty().html(data);
-    });
-    return false;
-  });
-});
-</script>

src/main/twirl/issues/issuedetail.scala.html

@@ -14,14 +14,14 @@
         <span class="pull-right"><a class="btn btn-small" href="#" id="edit">Edit</a></span>
       }
       <div class="small muted">
-        <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> opened this issue @datetime(issue.registeredDate)
+        @user(issue.openedUserName, styleClass="username strong") opened this issue @datetime(issue.registeredDate)
       </div>
       <h4 id="issueTitle">@issue.title</h4>
     </div>
     <div class="issue-info">
       <span id="label-assigned">
         @issue.assignedUserName.map { userName =>
-          @avatar(userName, 20) <a href="@url(userName)" class="username strong">@userName</a> is assigned
+          @avatar(userName, 20) @user(userName, styleClass="username strong") is assigned
         }.getOrElse("No one is assigned")
       </span>
       @if(hasWritePermission){
@@ -54,7 +54,7 @@
         @if(hasWritePermission){
           @helper.html.dropdown() {
             <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-            @milestones.map { case (milestone, _, _) =>
+            @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) =>
               <li>
                 <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
                   @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title
@@ -84,7 +84,7 @@
 <div class="issue-participants">
   @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
     <span class="strong">@participants.size</span> @plural(participants.size, "participant")
-    @participants.map { participant => <a href="@url(participant)">@avatar(participant, 20, tooltip = true)</a> }
+    @participants.map { participant => @avatarLink(participant, 20, tooltip = true) }
   }
 </div>
 <script>

src/main/twirl/issues/labels.scala.html

@@ -0,0 +1,51 @@
+@(issue: model.Issue,
+  issueLabels: List[model.Label],
+  labels: List[model.Label],
+  hasWritePermission: Boolean,
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@import view.helpers._
+<div style="margin-bottom: 8px;">
+  <span class="strong">Labels</span>
+  @if(hasWritePermission){
+    <div class="pull-right">
+      @helper.html.dropdown(right = true) {
+        @labels.map { label =>
+          <li>
+            <a href="#" class="toggle-label" data-label-id="@label.labelId">
+              @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
+              <span class="label" style="background-color: #@label.color;">&nbsp;</span>
+              @label.labelName
+            </a>
+          </li>
+        }
+      }
+    </div>
+  }
+</div>
+<ul class="label-list nav nav-pills nav-stacked">
+  @labellist(issueLabels)
+</ul>
+<script>
+$(function(){
+  $('a.toggle-label').click(function(){
+    var path, icon;
+    var i = $(this).children('i');
+    if(i.hasClass('icon-ok')){
+      path = 'delete';
+      icon = 'icon-white';
+    } else {
+      path = 'new';
+      icon = 'icon-ok';
+    }
+    $.post('@url(repository)/issues/@issue.issueId/label/' + path,
+    {
+      labelId : $(this).data('label-id')
+    },
+    function(data){
+      i.removeClass().addClass(icon);
+      $('ul.label-list').empty().html(data);
+    });
+    return false;
+  });
+});
+</script>

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

@@ -165,7 +165,7 @@
                 #@issue.issueId
               </span>
               <div class="small muted" style="margin-left: 20px;">
-                Opened by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
+                Opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)&nbsp;
                 @if(commentCount > 0){
                   <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
                 }

src/main/twirl/main.scala.html

@@ -54,14 +54,18 @@
               }
               @if(loginAccount.isDefined){
                 <a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a>
-                <a href="@path/new" class="menu" data-toggle="tooltip" data-placement="bottom" title="Create a new repo"><i class="icon-plus"></i></a>
+                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#"><i class="icon-plus"></i><span class="caret" style="vertical-align: middle;"></span></a>
+                <ul class="dropdown-menu">
+                  <li><a href="@path/new">New repository</a></li>
+                  <li><a href="@path/groups/new">New group</a></li>
+                </ul>
                 <a href="@url(loginAccount.get.userName)/_edit" class="menu" data-toggle="tooltip" data-placement="bottom" title="Account settings"><i class="icon-user"></i></a>
                 @if(loginAccount.get.isAdmin){
                   <a href="@path/admin/users" class="menu" data-toggle="tooltip" data-placement="bottom" title="Administration"><i class="icon-wrench"></i></a>
                 }
                 <a href="@path/signout" class="menu-last" data-toggle="tooltip" data-placement="bottom" title="Sign out"><i class="icon-share-alt"></i></a>
               } else {
-                <a href="@path/signin?redirect=@redirectUrl" class="btn btn-last">Sign in</a>
+                <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn btn-last" id="signin">Sign in</a>
               }
             </div><!--/.nav-collapse -->
           </div>

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

@@ -1,6 +1,6 @@
 @(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
   diffs: Seq[util.JGitUtil.DiffInfo],
-  members: List[String],
+  members: List[(String, String)],
   originId: String,
   forkedId: String,
   sourceId: String,
@@ -20,25 +20,25 @@
     </div>
     <div id="compare-edit" style="display: none;">
       <a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a>
-      @helper.html.dropdown(originRepository.owner + "/" + repository.name, "base fork") {
-        @members.map { member =>
-          <li><a href="#" class="origin-owner" data-name="@member">@helper.html.checkicon(member == originRepository.owner) @member/@repository.name</a></li>
+      @helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
+        @members.map { case (owner, name) =>
+          <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
         }
       }
       @helper.html.dropdown(originId, "base") {
         @originRepository.branchList.map { branch =>
-          <li><a href="#" class="origin-branch" data-name="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
+          <li><a href="#" class="origin-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
         }
       }
       ...
-      @helper.html.dropdown(forkedRepository.owner + "/" + repository.name, "head fork") {
-        @members.map { member =>
-          <li><a href="#" class="forked-owner" data-name="@member">@helper.html.checkicon(member == forkedRepository.owner) @member/@repository.name</a></li>
+      @helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
+        @members.map { case (owner, name) =>
+          <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
         }
       }
       @helper.html.dropdown(forkedId, "compare") {
         @forkedRepository.branchList.map { branch =>
-          <li><a href="#" class="forked-branch" data-name="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
+          <li><a href="#" class="forked-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
         }
       }
     </div>
@@ -49,7 +49,7 @@
     </div>
     <div id="pull-request-form" class="box" style="display: none;">
         <div class="box-content">
-          <form method="POST" action="@path/@originRepository.owner/@repository.name/pulls/new" validate="true">
+          <form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true">
             <div style="width: 260px; position: absolute; margin-left: 635px;">
               <div class="check-conflict" style="display: none;">
                 <img src="@assets/common/images/indicator.gif"/> Checking...
@@ -62,6 +62,7 @@
               <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
               <input type="hidden" name="targetBranch" value="@originId"/>
               <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
+              <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
               <input type="hidden" name="requestBranch" value="@forkedId"/>
               <input type="hidden" name="commitIdFrom" value="@sourceId"/>
               <input type="hidden" name="commitIdTo" value="@commitId"/>
@@ -104,14 +105,16 @@ $(function(){
 
     @if(members.isEmpty){
       location.href = '@url(repository)/compare/' +
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')) + '...' +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'));
     } else {
-      location.href = '@url(repository)/compare/' +
-        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ':' +
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')) + '...' +
-        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ':' +
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'));
+      location.href = '@path/' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + '/' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) +'/compare/' +
+        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('owner')) + ':' +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')) + '...' +
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + ':' +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'));
     }
   });
 
@@ -129,15 +132,15 @@ $(function(){
 
     @if(members.isEmpty){
       checkConflict(
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')),
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'))
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')),
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'))
       );
     } else {
       checkConflict(
-        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ":" +
-        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')),
-        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ":" +
-        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'))
+        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('owner')) + ":" +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('branch')),
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('owner')) + ":" +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('branch'))
       );
     }
   }

src/main/twirl/pulls/discussion.scala.html

@@ -1,8 +1,10 @@
 @(issue: model.Issue,
   pullreq: model.PullRequest,
   comments: List[model.IssueComment],
+  issueLabels: List[model.Label],
   collaborators: List[String],
   milestones: List[(model.Milestone, Int, Int)],
+  labels: List[model.Label],
   hasWritePermission: Boolean,
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
@@ -35,6 +37,18 @@
         </div>
       </div>
     }
+    @if(hasWritePermission && issue.closed && pullreq.userName == pullreq.requestUserName &&
+        pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
+      <div class="box issue-comment-box" style="background-color: #d0eeff;">
+        <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
+          <a href="@url(repository)/pull/@issue.issueId/delete/@pullreq.requestBranch" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
+          <div>
+            <span class="strong">Pull request successfully merged and closed</span>
+          </div>
+          <span class="small muted">You're all set-the <span class="label label-info monospace">@pullreq.requestBranch</span> branch can be safely deleted.</span>
+        </div>
+      </div>
+    }
     @issues.html.commentform(issue, hasWritePermission, repository)
   </div>
   <div class="span2">
@@ -51,6 +65,7 @@
       <span class="strong">@comments.size</span> @plural(comments.size, "comment")
     </div>
     <hr/>
+    @issues.html.labels(issue, issueLabels, labels, hasWritePermission, repository)
   </div>
 </div>
 <script>
@@ -62,8 +77,12 @@ $(function(){
 
   @if(hasWritePermission){
     $('.check-conflict').show();
-    $.get('@url(repository)/pull/@issue.issueId/mergeguide',
-      function(data){ $('.check-conflict').html(data); });
+    $.get('@url(repository)/pull/@issue.issueId/mergeguide', function(data){ $('.check-conflict').html(data); });
+
+    $('.delete-branch').click(function(e){
+      var branchName = $(e.target).data('name');
+      return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
+    });
   }
 });
 </script>

src/main/twirl/pulls/listparts.scala.html

@@ -85,7 +85,7 @@
             }
           </div>
         <div class="small muted" style="margin-left: 20px;">
-          @avatar(issue.openedUserName, 20) by <a href="@url(issue.openedUserName)" class="username">@issue.openedUserName</a> @datetime(issue.registeredDate)&nbsp;
+          @avatarLink(issue.openedUserName, 20) by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)&nbsp;
           @if(commentCount > 0){
             <i class="icon-comment"></i><a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">@commentCount @plural(commentCount, "comment")</a>
           }

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

@@ -1,8 +1,10 @@
 @(issue: model.Issue,
   pullreq: model.PullRequest,
   comments: List[model.IssueComment],
+  issueLabels: List[model.Label],
   collaborators: List[String],
   milestones: List[(model.Milestone, Int, Int)],
+  labels: List[model.Label],
   dayByDayCommits: Seq[Seq[util.JGitUtil.CommitInfo]],
   diffs: Seq[util.JGitUtil.DiffInfo],
   hasWritePermission: Boolean,
@@ -16,18 +18,18 @@
       @if(issue.closed) {
         @comments.find(_.action == "merge").map{ comment =>
           <span class="label label-info">Merged</span>
-          <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> merged @commits.size @plural(commits.size, "commit")
-          into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+          @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
+          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
           at @datetime(comment.registeredDate)
         }.getOrElse {
           <span class="label label-important">Closed</span>
-          <a href="@url(issue.openedUserName)" class="username strong">@issue.openedUserName</a> wants to merge @commits.size @plural(commits.size, "commit")
-          into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+          @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
+          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
         }
       } else {
         <span class="label label-success">Open</span>
-        <a href="@url(issue.openedUserName)" class="username strong">@issue.openedUserName</a> wants to merge @commits.size @plural(commits.size, "commit")
-        into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+        @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
+        into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
       }
     </div>
     <ul class="nav nav-tabs" id="pullreq-tab">
@@ -37,7 +39,7 @@
     </ul>
     <div class="tab-content">
       <div class="tab-pane active" id="discussion">
-        @pulls.html.discussion(issue, pullreq, comments, collaborators, milestones, hasWritePermission, repository)
+        @pulls.html.discussion(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
       </div>
       <div class="tab-pane" id="commits">
         @pulls.html.commits(dayByDayCommits, repository)

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

@@ -52,3 +52,33 @@
     </tr>
   </table>
 }
+<script src="@assets/common/js/jquery.ba-hashchange.js"></script>
+<script>
+$(window).load(function(){
+  $(window).hashchange(function(){
+    updateHighlighting();
+  }).hashchange();
+});
+
+/**
+ * Hightlight lines which are specified by URL hash.
+ */
+function updateHighlighting(){
+  var hash = location.hash;
+  if(hash.match(/#L\d+(-L\d+)?/)){
+    $('li.highlight').removeClass('highlight');
+    var lines = hash.substr(1).split('-');
+    if(lines.length == 1){
+      $('#' + lines[0]).addClass('highlight');
+      $(window).scrollTop($('#' + lines[0]).offset().top - 40);
+    } else if(lines.length > 1){
+      var start = parseInt(lines[0].substr(1));
+      var end   = parseInt(lines[1].substr(1));
+      for(var i = start; i <= end; i++){
+        $('#L' + i).addClass('highlight');
+      }
+      $(window).scrollTop($('#L' + start).offset().top - 40);
+    }
+  }
+}
+</script>