Update README.md

1) system property of JVM (e.g. -Dgitbucket.home=PATH_TO_DATADIR)
2) java -jar gitbucket.war --data=PATH_TO_DATADIR
3) Add context parameter "gitbucket.home" to web.xml

README.md

@@ -32,67 +32,97 @@ Installation
 --------
 
 1. Download latest **gitbucket.war** from [the release page](https://github.com/takezoe/gitbucket/releases).
-2. Deploy it to the servlet container such as Tomcat or Jetty.
+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.
 
 The default administrator account is **root** and password is **root**.
 
-(Since 1.6) 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]
+- --https=true
+- --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.
 
+For Installation on Windows Server with IIS see [this wiki page](https://github.com/takezoe/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)
+
 Release Notes
 --------
-### 1.6 - COMMING SOON!
-- Web hook.
-- Performance improvement for pull request.
-- Executable war file.
-- Specify suitable Content-Type for downloaded files in the repository viewer.
-- Fixed some bugs.
+### 1.8 - COMMING SOON!
+- 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
+- Hard wrap for Markdown
+- Add new some options to specify the data directory
+- 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 full name as user property
+- Change link color for absent Wiki pages
+- Add ZIP download button to the repository viewer tab
+- Improve ZIP exporting performance
+- Expand issue and comment textarea for long text automatically
+- Add conflict detection in Wiki
+- Add reverting wiki page from history
+- Match committer to user name by email address
+- Mail notification sender is customizable
+- Add link to changeset in refs comment for issues
+- Fix some bugs
+
+### 1.6 - 1 Oct 2013
+- Web hook
+- Performance improvement for pull request
+- Executable war file
+- Specify suitable Content-Type for downloaded files in the repository viewer
+- Fix some bugs
 
 ### 1.5 - 4 Sep 2013
-- Fork and pull request.
-- LDAP authentication.
-- Mail notification.
-- Add an option to turn off the gravatar support.
-- Add the branch tab in the repository viewer.
-- Encoding auto detection for the file content in the repository viewer.
-- Add favicon, header logo and icons for the timeline.
-- Specify data directory via environment variable GITBUCKET_HOME.
-- Fixed some bugs.
+- Fork and pull request
+- LDAP authentication
+- Mail notification
+- Add an option to turn off the gravatar support
+- Add the branch tab in the repository viewer
+- Encoding auto detection for the file content in the repository viewer
+- Add favicon, header logo and icons for the timeline
+- Specify data directory via environment variable GITBUCKET_HOME
+- Fix some bugs
 
 ### 1.4 - 31 Jul 2013
-- Group management.
-- Repository search for code and issues.
-- Display user related issues on the dashboard.
-- Display participants avatar of issues on the issue page.
-- Performance improvement for repository viewer.
-- Alert by milestone due date.
-- H2 database administration console.
-- Fixed some bugs.
+- Group management
+- Repository search for code and issues
+- Display user related issues on the dashboard
+- Display participants avatar of issues on the issue page
+- Performance improvement for repository viewer
+- Alert by milestone due date
+- H2 database administration console
+- Fix some bugs
 
 ### 1.3 - 18 Jul 2013
-- Batch updating for issues.
-- Display assigned user on issue list.
-- User icon and Gravatar support.
-- Convert @xxxx to link to the account page.
-- Add copy to clipboard button for git clone URL.
-- Allows multi-byte characters as wiki page name.
-- Allows to create the empty repository.
-- Fixed some bugs.
+- Batch updating for issues
+- Display assigned user on issue list
+- User icon and Gravatar support
+- Convert @xxxx to link to the account page
+- Add copy to clipboard button for git clone URL
+- Allow multi-byte characters as wiki page name
+- Allow to create the empty repository
+- Fix some bugs
 
 ### 1.2 - 09 Jul 2013
-- Added activity timeline.
-- Bugfix for Git 1.8.1.5 or later.
-- Allows multi-byte characters as label.
-- Fixed some bugs.
+- Add activity timeline
+- Bugfix for Git 1.8.1.5 or later
+- Allow multi-byte characters as label
+- Fix some bugs
 
 ### 1.1 - 05 Jul 2013
-- Fixed some bugs.
-- Upgrade to JGit 3.0.
+- Fix some bugs
+- Upgrade to JGit 3.0
 
 ### 1.0 - 04 Jul 2013
-- This is a first public release.
+- This is a first public release

build.xml

@@ -9,13 +9,19 @@
   <property name="jetty.version" value="8.1.8.v20121106"/>
   <property name="servlet.version" value="3.0.0.v201112011016"/>
 
+  <condition property="sbt.exec" value="sbt.bat" else="sbt.sh">
+    <os family="windows" />
+  </condition>
+
   <target name="clean">
     <delete dir="${embed.classes.dir}"/>
     <delete file="${target.dir}/scala-${scala.version}/gitbucket.war"/>
   </target>
 
   <target name="war" depends="clean">
-    <exec command="sbt.bat clean package"/>
+    <exec executable="${sbt.exec}" resolveexecutable="true" failonerror="true">
+      <arg line="clean compile test package" />
+    </exec>
   </target>
 
   <target name="embed" depends="war">
@@ -40,7 +46,7 @@
     <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
          basedir="${target.dir}/scala-${scala.version}/classes"
          update = "true"
-         includes="JettyLauncher.class"/>
+         includes="JettyLauncher.class,HttpsSupportConnector.class"/>
   </target>
 
   <target name="rename" depends="embed">
@@ -52,4 +58,4 @@
   </target>
 
 
-</project>
+</project>

contrib/redhat/gitbucket.conf

@@ -0,0 +1,20 @@
+# Bind host
+#GITBUCKET_HOST=0.0.0.0
+
+# Server port
+#GITBUCKET_PORT=8080
+
+# Force HTTPS scheme
+#GITBUCKET_HTTPS=false
+
+# Data directory (GITBUCKET_HOME/gitbucket)
+#GITBUCKET_HOME=/var/lib/gitbucket
+
+# Path to the WAR file
+#GITBUCKET_WAR_FILE=/usr/share/gitbucket/lib/gitbucket.war
+
+# URL prefix for the GitBucket page (http://<host>:<port>/<prefix>/)
+#GITBUCKET_PREFIX=
+
+# Other Java option
+#GITBUCKET_JVM_OPTS=

contrib/redhat/gitbucket.init

@@ -0,0 +1,109 @@
+#!/bin/bash
+#
+# /etc/rc.d/init.d/gitbucket
+#
+# Starts the GitBucket server
+#
+# chkconfig: 345 60 40
+# description: Run GitBucket server
+# processname: java
+
+# Source function library
+. /etc/rc.d/init.d/functions
+
+# Default values
+GITBUCKET_HOME=/var/lib/gitbucket
+GITBUCKET_WAR_FILE=/usr/share/gitbucket/lib/gitbucket.war
+
+# Pull in cq settings
+[ -f /etc/sysconfig/gitbucket ] && . /etc/sysconfig/gitbucket
+
+# Location of the log and PID file
+LOG_FILE=/var/log/gitbucket/run.log
+PID_FILE=/var/run/gitbucket.pid
+
+# Default return value
+RETVAL=0
+
+
+start() {
+	echo -n $"Starting GitBucket server: "
+
+	# Compile statup parameters
+	if [ $GITBUCKET_PORT ]; then
+		START_OPTS="${START_OPTS} --port=${GITBUCKET_PORT}"
+	fi
+	if [ $GITBUCKET_PREFIX ]; then
+		START_OPTS="${START_OPTS} --prefix=${GITBUCKET_PREFIX}"
+	fi
+	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 &
+	RETVAL=$?
+
+	# Store PID of the Java process into a file
+	echo $! > $PID_FILE
+
+	if [ $RETVAL -eq 0 ] ; then
+		success "GitBucket startup"
+	else
+		failure "GitBucket startup"
+	fi
+
+	echo
+	return $RETVAL
+}
+
+
+stop() {
+	echo -n $"Stopping GitBucket server: "
+
+	# Run the Java process
+	kill $(cat $PID_FILE 2>/dev/null) >>$LOG_FILE 2>&1
+	RETVAL=$?
+
+	if [ $RETVAL -eq 0 ] ; then
+		rm -f $PID_FILE
+		success "GitBucket stopping"
+	else
+		failure "GitBucket stopping"
+	fi
+
+	echo
+	return $RETVAL
+}
+
+
+restart() {
+	stop
+	start
+}
+
+
+case "$1" in
+start)
+	start
+	;;
+stop)
+	stop
+	;;
+restart)
+	restart
+	;;
+status)
+	status -p $PID_FILE java
+	RETVAL=$?
+	;;
+*)
+	echo $"Usage: $0 [start|stop|restart|status]"
+	RETVAL=2
+esac
+
+
+exit $RETVAL

contrib/redhat/gitbucket.spec

@@ -0,0 +1,47 @@
+Name:		gitbucket
+Summary:	GitHub clone written with Scala.
+Version:	1.7
+Release:	1%{?dist}
+License:	Apache
+URL:		https://github.com/takezoe/gitbucket
+Group:		System/Servers
+Source0:	%{name}.war
+Source1:	%{name}.init
+Source2:	%{name}.conf
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch:	noarch
+Requires:	java >= 1.7
+
+
+%description
+
+GitBucket is the easily installable GitHub clone written with Scala.
+
+
+%install
+[ "%{buildroot}" != / ] && %{__rm} -rf "%{buildroot}"
+%{__mkdir_p} %{buildroot}{%{_sysconfdir}/{init.d,sysconfig},%{_datarootdir}/%{name}/lib,%{_sharedstatedir}/%{name},%{_localstatedir}/log/%{name}}
+%{__install} -m 0644 %{SOURCE0} %{buildroot}%{_datarootdir}/%{name}/lib
+%{__install} -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
+%{__install} -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/%{name}
+touch %{buildroot}%{_localstatedir}/log/%{name}/run.log
+
+
+%clean
+[ "%{buildroot}" != / ] && %{__rm} -rf "%{buildroot}"
+
+
+%files
+%defattr(-,root,root,-)
+%{_datarootdir}/%{name}/lib/%{name}.war
+%{_sysconfdir}/init.d/%{name}
+%config %{_sysconfdir}/sysconfig/%{name}
+%{_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.

project/build.properties

@@ -0,0 +1 @@
+sbt.version=0.12.3

project/build.scala

@@ -10,7 +10,7 @@ object MyBuild extends Build {
   val Organization = "jp.sf.amateras"
   val Name = "gitbucket"
   val Version = "0.0.1"
-  val ScalaVersion = "2.10.1"
+  val ScalaVersion = "2.10.3"
   val ScalatraVersion = "2.2.1"
 
   lazy val project = Project (
@@ -25,27 +25,31 @@ object MyBuild extends Build {
         Classpaths.typesafeReleases,
         "amateras-repo" at "http://amateras.sourceforge.jp/mvn/"
       ),
+      scalacOptions := Seq("-deprecation"),
       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.4",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.0.2",
+        "org.json4s" %% "json4s-jackson" % "3.2.5",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.0.8",
         "commons-io" % "commons-io" % "2.4",
-        "org.pegdown" % "pegdown" % "1.3.0",
+        "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.2.5",
+        "org.apache.httpcomponents" % "httpclient" % "4.3",
         "com.typesafe.slick" %% "slick" % "1.0.1",
         "com.novell.ldap" % "jldap" % "2009-10-07",
-        "com.h2database" % "h2" % "1.3.171",
-        "ch.qos.logback" % "logback-classic" % "1.0.6" % "runtime",
+        "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,
+      javacOptions in compile ++= Seq("-target", "6", "-source", "6"),
+      testOptions in Test += Tests.Argument(TestFrameworks.Specs2, "junitxml", "console"),
       packageOptions += Package.MainClass("JettyLauncher")
     ) ++ seq(Twirl.settings: _*)
   )
-}
+}

project/plugins.sbt

@@ -5,3 +5,5 @@ addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
 addSbtPlugin("org.scalatra.sbt" % "scalatra-sbt" % "0.3.0")
 
 addSbtPlugin("io.spray" % "sbt-twirl" % "0.6.1")
+
+addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.2")

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 -jar "%SCRIPT_DIR%\sbt-launch-0.12.3.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 -jar `dirname $0`/sbt-launch-0.12.3.jar "$@"

src/main/java/JettyLauncher.java

@@ -1,30 +1,52 @@
+import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.webapp.WebAppContext;
 
+import java.io.IOException;
 import java.net.URL;
 import java.security.ProtectionDomain;
 
 public class JettyLauncher {
     public static void main(String[] args) throws Exception {
+        String host = null;
         int port = 8080;
         String contextPath = "/";
+        boolean forceHttps = false;
 
-        for(String arg: args){
-            if(arg.startsWith("--") && arg.contains("=")){
+        for(String arg: args) {
+            if(arg.startsWith("--") && arg.contains("=")) {
                 String[] dim = arg.split("=");
-                if(dim.length >= 2){
-                    if(dim[0].equals("--port")){
+                if(dim.length >= 2) {
+                    if(dim[0].equals("--host")) {
+                        host = dim[1];
+                    } else if(dim[0].equals("--port")) {
                         port = Integer.parseInt(dim[1]);
-                    } else if(dim[0].equals("--prefix")){
+                    } 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]);
                     }
                 }
             }
         }
 
-        Server server = new Server(port);
-        WebAppContext context  = new WebAppContext();
-        ProtectionDomain domain   = JettyLauncher.class.getProtectionDomain();
+        Server server = new Server();
+
+        HttpsSupportConnector connector = new HttpsSupportConnector(forceHttps);
+        if(host != null) {
+            connector.setHost(host);
+        }
+        connector.setMaxIdleTime(1000 * 60 * 60);
+        connector.setSoLingerTime(-1);
+        connector.setPort(port);
+        server.addConnector(connector);
+
+        WebAppContext context = new WebAppContext();
+        ProtectionDomain domain = JettyLauncher.class.getProtectionDomain();
         URL location = domain.getCodeSource().getLocation();
 
         context.setContextPath(contextPath);
@@ -37,3 +59,19 @@ public class JettyLauncher {
         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_7.sql

@@ -0,0 +1,5 @@
+ALTER TABLE ACCOUNT ADD COLUMN FULL_NAME VARCHAR(100);
+
+UPDATE ACCOUNT SET FULL_NAME = USER_NAME WHERE FULL_NAME IS NULL;
+
+ALTER TABLE ACCOUNT ALTER COLUMN FULL_NAME SET NOT NULL;

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,9 +1,19 @@
+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")
@@ -20,7 +30,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

@@ -6,6 +6,7 @@ import util.StringUtil._
 import util.Directory._
 import jp.sf.amateras.scalatra.forms._
 import org.scalatra.FlashMapSupport
+import org.apache.commons.io.FileUtils
 
 class AccountController extends AccountControllerBase
   with SystemSettingsService with AccountService with RepositoryService with ActivityService
@@ -15,15 +16,16 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
   self: SystemSettingsService with AccountService with RepositoryService with ActivityService
     with OneselfAuthenticator =>
 
-  case class AccountNewForm(userName: String, password: String,mailAddress: String,
+  case class AccountNewForm(userName: String, password: String, fullName: String, mailAddress: String,
                             url: Option[String], fileId: Option[String])
 
-  case class AccountEditForm(password: Option[String], mailAddress: String,
+  case class AccountEditForm(password: Option[String], fullName: String, mailAddress: String,
                              url: Option[String], fileId: Option[String], clearImage: Boolean)
 
   val newForm = mapping(
     "userName"    -> trim(label("User name"    , text(required, maxlength(100), identifier, uniqueUserName))),
     "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
+    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text())))
@@ -31,6 +33,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   val editForm = mapping(
     "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")))),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
     "fileId"      -> trim(label("File ID"      , optional(text()))),
@@ -84,6 +87,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     getAccountByUserName(userName).map { account =>
       updateAccount(account.copy(
         password    = form.password.map(sha1).getOrElse(account.password),
+        fullName    = form.fullName,
         mailAddress = form.mailAddress,
         url         = form.url))
 
@@ -94,6 +98,27 @@ 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("/register"){
     if(loadSystemSettings().allowAccountRegistration){
       if(context.loginAccount.isDefined){
@@ -106,7 +131,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
 
   post("/register", newForm){ form =>
     if(loadSystemSettings().allowAccountRegistration){
-      createAccount(form.userName, sha1(form.password), form.mailAddress, false, form.url)
+      createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, false, form.url)
       updateImage(form.userName, form.fileId, false)
       redirect("/signin")
     } else NotFound

src/main/scala/app/ControllerBase.scala

@@ -3,7 +3,7 @@ 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._
@@ -15,12 +15,13 @@ import service.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 Validations {
 
   implicit val jsonFormats = DefaultFormats
 
@@ -37,7 +38,7 @@ abstract class ControllerBase extends ScalatraFilter
       val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
       if(account == null){
         // Redirect to login form
-        httpResponse.sendRedirect(context + "/signin?" + path)
+        httpResponse.sendRedirect(context + "/signin?" + StringUtil.urlEncode(path))
       } else if(account.isAdmin){
         // H2 Console (administrators only)
         chain.doFilter(request, response)
@@ -71,7 +72,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 +84,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,7 +107,7 @@ 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(currentURL)))
         }
       }
     }
@@ -169,13 +170,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

@@ -4,12 +4,11 @@ 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
-import scala.Some
+import org.eclipse.jgit.lib.{FileMode, Constants}
+import org.eclipse.jgit.dircache.DirCache
+import org.scalatra.i18n.Messages
 
 class CreateRepositoryController extends CreateRepositoryControllerBase
   with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
@@ -74,32 +73,26 @@ trait CreateRepositoryControllerBase extends ControllerBase {
         JGitUtil.initRepository(gitdir)
 
         if(form.createReadme){
-          val tmpdir = getInitRepositoryDir(form.owner, form.name)
-          try {
-            // Clone the repository
-            Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
+          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"
+            }
 
-            // 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")
+            builder.add(JGitUtil.createDirCacheEntry("README.md", FileMode.REGULAR_FILE,
+              inserter.insert(Constants.OBJ_BLOB, content.getBytes("UTF-8"))))
+            builder.finish()
 
-            val git = Git.open(tmpdir)
-            git.add.addFilepattern("README.md").call
-            git.commit
-              .setCommitter(new PersonIdent(loginUserName, loginAccount.mailAddress))
-              .setMessage("Initial commit").call
-            git.push.call
-
-          } finally {
-            FileUtils.deleteDirectory(tmpdir)
+            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter),
+              loginAccount.fullName, loginAccount.mailAddress, "Initial commit")
           }
         }
 
@@ -181,7 +174,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
   }
 
   private def existsAccount: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] =
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
       if(getAccountByUserName(value).isEmpty) Some("User or group does not exist.") else None
   }
 
@@ -189,7 +182,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
    * 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] =
+    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.")
       }

src/main/scala/app/DashboardController.scala

@@ -87,10 +87,6 @@ trait DashboardControllerBase extends ControllerBase {
     val counts = countIssueGroupByRepository(
       IssueSearchCondition().copy(state = condition.state), Map.empty, true, repositories: _*)
 
-    getRepositoryNamesOfUser(userName).map { repoName =>
-      (userName, repoName, counts.collectFirst { case (_, repoName, count) => count })
-    }
-
     dashboard.html.pulls(
       pulls.html.listparts(
         searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, repositories: _*),

src/main/scala/app/IndexController.scala

@@ -30,7 +30,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

@@ -14,7 +14,7 @@ class IssuesController extends IssuesControllerBase
   with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait IssuesControllerBase extends ControllerBase {
-  self: IssuesService with RepositoryService with LabelsService with MilestonesService with ActivityService
+  self: IssuesService with RepositoryService with AccountService with LabelsService with MilestonesService with ActivityService
     with ReadableUsersAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator =>
 
   case class IssueCreateForm(title: String, content: Option[String],
@@ -65,7 +65,7 @@ trait IssuesControllerBase extends ControllerBase {
           _,
           getComments(owner, name, issueId.toInt),
           getIssueLabels(owner, name, issueId.toInt),
-          (getCollaborators(owner, name) :+ owner).sorted,
+          (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
           getMilestonesWithIssueCount(owner, name),
           getLabels(owner, name),
           hasWritePermission(owner, name, context.loginAccount),
@@ -77,7 +77,7 @@ trait IssuesControllerBase extends ControllerBase {
   get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
     defining(repository.owner, repository.name){ case (owner, name) =>
       issues.html.create(
-          (getCollaborators(owner, name) :+ owner).sorted,
+        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
           getMilestones(owner, name),
           getLabels(owner, name),
           hasWritePermission(owner, name, context.loginAccount),
@@ -155,6 +155,16 @@ trait IssuesControllerBase extends ControllerBase {
     }
   })
 
+  ajaxPost("/:owner/:repository/issue_comments/delete/:id")(readableUsersOnly { repository =>
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      getComment(owner, name, params("id")).map { comment =>
+        if(isEditable(owner, name, comment.commentedUserName)){
+          Ok(deleteComment(comment.commentId))
+        } else Unauthorized
+      } getOrElse NotFound
+    }
+  })
+
   ajaxGet("/:owner/:repository/issues/_data/:id")(readableUsersOnly { repository =>
     getIssue(repository.owner, repository.name, params("id")) map { x =>
       if(isEditable(x.userName, x.repositoryName, x.openedUserName)){
@@ -228,13 +238,13 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    defining(params("value").toInt){ labelId =>
+    params("value").toIntOpt.map{ labelId =>
       executeBatch(repository) { issueId =>
         getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
           registerIssueLabel(repository.owner, repository.name, issueId, labelId)
         }
       }
-    }
+    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
@@ -254,7 +264,7 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
-  val milestoneId      = (key: String) => params.get(key) collect { case x if x.trim != "" => x.toInt }
+  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)
 
   private def isEditable(owner: String, repository: String, author: String)(implicit context: app.Context): Boolean =
     hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName

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/MilestonesController.scala

@@ -4,6 +4,7 @@ import jp.sf.amateras.scalatra.forms._
 
 import service._
 import util.{CollaboratorsAuthenticator, ReferrerAuthenticator}
+import util.Implicits._
 
 class MilestonesController extends MilestonesControllerBase
   with MilestonesService with RepositoryService with AccountService
@@ -39,34 +40,44 @@ trait MilestonesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/edit")(collaboratorsOnly { repository =>
-    issues.milestones.html.edit(getMilestone(repository.owner, repository.name, params("milestoneId").toInt), repository)
+    params("milestoneId").toIntOpt.map{ milestoneId =>
+      issues.milestones.html.edit(getMilestone(repository.owner, repository.name, milestoneId), repository)
+    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/milestones/:milestoneId/edit", milestoneForm)(collaboratorsOnly { (form, repository) =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
-      updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
+        updateMilestone(milestone.copy(title = form.title, description = form.description, dueDate = form.dueDate))
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/close")(collaboratorsOnly { repository =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
-      closeMilestone(milestone)
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
+        closeMilestone(milestone)
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/open")(collaboratorsOnly { repository =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
-      openMilestone(milestone)
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
+        openMilestone(milestone)
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 
   get("/:owner/:repository/issues/milestones/:milestoneId/delete")(collaboratorsOnly { repository =>
-    getMilestone(repository.owner, repository.name, params("milestoneId").toInt).map { milestone =>
-      deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
-      redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+    params("milestoneId").toIntOpt.flatMap{ milestoneId =>
+      getMilestone(repository.owner, repository.name, milestoneId).map { milestone =>
+        deleteMilestone(repository.owner, repository.name, milestone.milestoneId)
+        redirect(s"/${repository.owner}/${repository.name}/issues/milestones")
+      }
     } getOrElse NotFound
   })
 

src/main/scala/app/PullRequestsController.scala

@@ -8,25 +8,27 @@ 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 scala.Some
 import service.RepositoryService.RepositoryTreeNode
 import util.JGitUtil.CommitInfo
+import org.slf4j.LoggerFactory
+import org.eclipse.jgit.merge.MergeStrategy
+import org.eclipse.jgit.errors.NoMergeBaseException
 
 class PullRequestsController extends PullRequestsControllerBase
   with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
   with ReferrerAuthenticator with CollaboratorsAuthenticator
 
 trait PullRequestsControllerBase extends ControllerBase {
-  self: RepositoryService with IssuesService with MilestonesService with ActivityService with PullRequestService
+  self: RepositoryService with AccountService with IssuesService with MilestonesService with ActivityService with PullRequestService
     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()))),
@@ -63,7 +65,9 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
-    defining(repository.owner, repository.name, params("id").toInt){ case (owner, name, issueId) =>
+    params("id").toIntOpt.flatMap{ issueId =>
+      val owner = repository.owner
+      val name = repository.name
       getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
         using(Git.open(getRepositoryDir(owner, name))){ git =>
           val (commits, diffs) =
@@ -71,38 +75,38 @@ trait PullRequestsControllerBase extends ControllerBase {
 
           pulls.html.pullreq(
             issue, pullreq,
-            getComments(owner, name, issueId.toInt),
-            (getCollaborators(owner, name) :+ owner).sorted,
+            getComments(owner, name, issueId),
+            (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
             getMilestonesWithIssueCount(owner, name),
             commits,
             diffs,
             hasWritePermission(owner, name, context.loginAccount),
             repository)
         }
-      } getOrElse NotFound
-    }
+      }
+    } getOrElse NotFound
   })
 
   ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
-    defining(repository.owner, repository.name, params("id").toInt){ case (owner, name, issueId) =>
+    params("id").toIntOpt.flatMap{ issueId =>
+      val owner = repository.owner
+      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")
-      } getOrElse NotFound()
-    }
+          s"${baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
+      }
+    } getOrElse NotFound
   })
 
   post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
-    defining(repository.owner, repository.name, params("id").toInt){ case (owner, name, issueId) =>
+    params("id").toIntOpt.flatMap { issueId =>
+      val owner = repository.owner
+      val name = repository.name
       LockUtil.lock(s"${owner}/${name}/merge"){
         getPullRequest(owner, name, issueId).map { case (issue, pullreq) =>
-          val remote = getRepositoryDir(owner, name)
-          val tmpdir = new java.io.File(getTemporaryDir(owner, name), s"merge-${issueId}")
-          val git = Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(pullreq.branch).call
-
-          try {
+          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")
@@ -112,37 +116,43 @@ trait PullRequestsControllerBase extends ControllerBase {
             // 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){
+            // 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.")
             }
 
-            // merge commit
-            git.getRepository.writeMergeCommitMsg(
-              s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n"
-              + form.message)
+            // 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)
 
-            git.commit
-              .setCommitter(new PersonIdent(loginAccount.userName, loginAccount.mailAddress))
-              .call
+            // insertObject and got mergeCommit Object Id
+            val inserter = git.getRepository.newObjectInserter
+            val mergeCommitId = inserter.insert(mergeCommit)
+            inserter.flush()
+            inserter.release()
 
-            // push
-            git.push.call
+            // 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)
@@ -159,14 +169,10 @@ trait PullRequestsControllerBase extends ControllerBase {
             }
 
             redirect(s"/${owner}/${name}/pull/${issueId}")
-
-          } finally {
-            git.getRepository.close
-            FileUtils.deleteDirectory(tmpdir)
           }
-        } getOrElse NotFound
+        }
       }
-    }
+    } getOrElse NotFound
   })
 
   get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
@@ -186,8 +192,11 @@ trait PullRequestsControllerBase extends ControllerBase {
       }
       case _ => {
         using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
-          val defaultBranch = JGitUtil.getDefaultBranch(git, forkedRepository).get._2
-          redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}")
+          JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) =>
+            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}")
+          } getOrElse {
+            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}")
+          }
         }
       }
     }
@@ -310,31 +319,49 @@ 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)
-      val tmpdir = new java.io.File(getTemporaryDir(userName, repositoryName), "merge-check")
-      if(tmpdir.exists()){
-        FileUtils.deleteDirectory(tmpdir)
+      using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
+        val remoteRefName = s"refs/heads/${branch}"
+        val tmpRefName = s"refs/merge-check/${userName}/${branch}"
+
+        withTmpRefSpec(new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true), git) { ref =>
+          // fetch objects from origin repository branch
+          git.fetch
+             .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
+             .setRefSpecs(ref)
+             .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
+          }
+        }
       }
+    }
+  }
 
-      val git = Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(branch).call
-      try {
-        git.checkout.setName(branch).call
-
-        git.fetch
-          .setRemote(getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString)
-          .setRefSpecs(new RefSpec(s"refs/heads/${branch}:refs/heads/${requestBranch}")).call
-
-        val result = git.merge
-          .include(git.getRepository.resolve("FETCH_HEAD"))
-          .setCommit(false).call
-
-        result.getConflicts != null
-
-      } finally {
-        git.getRepository.close
-        FileUtils.deleteDirectory(tmpdir)
+  /**
+   * 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
+        }
       }
     }
   }

src/main/scala/app/RepositorySettingsController.scala

@@ -6,6 +6,7 @@ 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._
@@ -137,13 +138,18 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
         .setMaxCount(3)
         .call.iterator.asScala.map(new CommitInfo(_))
 
-      callWebHook(repository.owner, repository.name,
-        WebHookPayload(
-          git,
-          "refs/heads/" + repository.repository.defaultBranch,
-          repository,
-          commits.toList,
-          getAccountByUserName(repository.owner).get))
+      val webHookURLs = getWebHookURLs(repository.owner, repository.name)
+      if(webHookURLs.nonEmpty){
+        val owner = getAccountByUserName(repository.owner).get
+        callWebHook(repository.owner, repository.name, webHookURLs,
+          WebHookPayload(
+            git,
+            owner,
+            "refs/heads/" + repository.repository.defaultBranch,
+            repository,
+            commits.toList,
+            owner))
+      }
 
       flash += "info" -> "Test payload deployed!"
     }
@@ -174,7 +180,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.")
   }
 
@@ -182,9 +188,11 @@ 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)
+                  => Some("User does not exist.")
         case Some(x) if(x.userName == params("owner") || getCollaborators(params("owner"), params("repository")).contains(x.userName))
                   => Some("User can access this repository already.")
         case _    => None

src/main/scala/app/RepositoryViewerController.scala

@@ -11,6 +11,7 @@ import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
+import java.util.zip.{ZipEntry, ZipOutputStream}
 
 class RepositoryViewerController extends RepositoryViewerControllerBase 
   with RepositoryService with AccountService with ReferrerAuthenticator
@@ -37,7 +38,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository")(referrersOnly {
     fileList(_)
   })
-  
+
   /**
    * Displays the file list of the specified path and branch.
    */
@@ -49,13 +50,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       fileList(repository, id, path)
     }
   })
-  
+
   /**
    * Displays the commit list of the specified resource.
    */
   get("/:owner/:repository/commits/*")(referrersOnly { repository =>
     val (branchName, path) = splitPath(repository, multiParams("splat").head)
-    val page = params.getOrElse("page", "1").toInt
+    val page = params.get("page").flatMap(_.toIntOpt).getOrElse(1)
 
     using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
@@ -93,17 +94,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
 
       if(raw){
         // Download
-        val mimeType = FileUtil.getMimeType(path)
-        val bytes = JGitUtil.getContent(git, objectId, false).get
-
-        contentType = if(mimeType == "application/octet-stream" && FileUtil.isText(bytes)){
-          "text/plain"
-        } else {
-          mimeType
+        defining(JGitUtil.getContent(git, objectId, false).get){ bytes =>
+          contentType = FileUtil.getContentType(path, bytes)
+          bytes
         }
-        //response.setHeader("Content-Disposition", s"inline; filename=${FileUtil.getFileName(path)}")
-        bytes
-
       } else {
         // Viewer
         val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
@@ -127,7 +121,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       }
     }
   })
-  
+
   /**
    * Displays details of the specified commit.
    */
@@ -145,7 +139,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       }
     }
   })
-  
+
   /**
    * Displays branches.
    */
@@ -172,7 +166,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    */
   get("/:owner/:repository/archive/:name")(referrersOnly { repository =>
     val name = params("name")
-    
+
     if(name.endsWith(".zip")){
       val revision = name.replaceFirst("\\.zip$", "")
       val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
@@ -180,25 +174,35 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         FileUtils.deleteDirectory(workDir)
       }
       workDir.mkdirs
-      
-      // clone the repository
-      val cloneDir = new File(workDir, revision)
-      using(Git.cloneRepository
-          .setURI(getRepositoryDir(repository.owner, repository.name).toURI.toString)
-          .setDirectory(cloneDir)
-          .call){ git =>
-      
-        // checkout the specified revision
-        git.checkout.setName(revision).call
-      }
-      
-      // remove .git
-      FileUtils.deleteDirectory(new File(cloneDir, ".git"))
-      
-      // create zip file
+
       val zipFile = new File(workDir, (if(revision.length == 40) revision.substring(0, 10) else revision) + ".zip")
-      FileUtil.createZipFile(zipFile, cloneDir)
-      
+
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+        using(new TreeWalk(git.getRepository)){ walk =>
+          val reader   = walk.getObjectReader
+          val objectId = new MutableObjectId
+
+          using(new ZipOutputStream(new java.io.FileOutputStream(zipFile))){ out =>
+            walk.addTree(revCommit.getTree)
+            walk.setRecursive(true)
+
+            while(walk.next){
+              val name = walk.getPathString
+              val mode = walk.getFileMode(0)
+              if(mode != FileMode.TREE){
+                walk.getObjectId(objectId, 0)
+                val entry = new ZipEntry(name)
+                val loader = reader.open(objectId)
+                entry.setSize(loader.getSize)
+                out.putNextEntry(entry)
+                loader.copyTo(out)
+              }
+            }
+          }
+        }
+      }
+
       contentType = "application/octet-stream"
       zipFile
     } else {
@@ -228,6 +232,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.
    * 
@@ -247,8 +254,10 @@ trait RepositoryViewerControllerBase extends ControllerBase {
           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 =>
+            // process README.md or README.markdown
+            val readme = files.find { file =>
+              readmeFiles.contains(file.name.toLowerCase)
+            }.map { file =>
               StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
             }
 
@@ -262,4 +271,4 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
   
-}
+}

src/main/scala/app/SignInController.scala

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

src/main/scala/app/SystemSettingsController.scala

@@ -21,7 +21,9 @@ trait SystemSettingsControllerBase extends ControllerBase with FlashMapSupport {
         "port"                     -> trim(label("SMTP Port", optional(number()))),
         "user"                     -> trim(label("SMTP User", optional(text()))),
         "password"                 -> trim(label("SMTP Password", optional(text()))),
-        "ssl"                      -> trim(label("Enable SSL", optional(boolean())))
+        "ssl"                      -> trim(label("Enable SSL", optional(boolean()))),
+        "fromAddress"              -> trim(label("FROM Address", optional(text()))),
+        "fromName"                 -> trim(label("FROM Name", optional(text())))
     )(Smtp.apply)),
     "ldapAuthentication"       -> trim(label("LDAP", boolean())),
     "ldap"                     -> optionalIfNotChecked("ldapAuthentication", mapping(
@@ -31,7 +33,9 @@ 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)))
+        "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)
 

src/main/scala/app/UserManagementController.scala

@@ -5,6 +5,8 @@ import util.AdminAuthenticator
 import util.StringUtil._
 import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
+import org.apache.commons.io.FileUtils
+import util.Directory._
 
 class UserManagementController extends UserManagementControllerBase
   with AccountService with RepositoryService with AdminAuthenticator
@@ -12,58 +14,66 @@ class UserManagementController extends UserManagementControllerBase
 trait UserManagementControllerBase extends AccountManagementControllerBase {
   self: AccountService with RepositoryService with AdminAuthenticator =>
   
-  case class NewUserForm(userName: String, password: String, mailAddress: String, isAdmin: Boolean,
+  case class NewUserForm(userName: String, password: String, fullName: String,
+                         mailAddress: String, isAdmin: Boolean,
                          url: Option[String], fileId: Option[String])
 
-  case class EditUserForm(userName: String, password: Option[String], mailAddress: String, isAdmin: Boolean,
-                          url: Option[String], fileId: Option[String], clearImage: Boolean)
+  case class EditUserForm(userName: String, password: Option[String], fullName: String,
+                          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])
 
   case class EditGroupForm(groupName: String, url: Option[String], fileId: Option[String],
-                           memberNames: Option[String], clearImage: Boolean)
+                           memberNames: Option[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)))),
-    "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))))),
-    "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))),
-    "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()))),
+    "memberNames" -> trim(label("Member Names" ,optional(text())))
   )(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()))),
+    "memberNames" -> trim(label("Member Names" ,optional(text()))),
+    "clearImage"  -> trim(label("Clear image"  ,boolean())),
+    "removed"     -> trim(label("Disable"      ,boolean()))
   )(EditGroupForm.apply)
 
   get("/admin/users")(adminOnly {
-    val users = getAllUsers()
+    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)
     }.toMap
-    admin.users.html.list(users, members)
+    admin.users.html.list(users, members, includeRemoved)
   })
   
   get("/admin/users/_newuser")(adminOnly {
@@ -71,24 +81,39 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   })
   
   post("/admin/users/_newuser", newUserForm)(adminOnly { form =>
-    createAccount(form.userName, sha1(form.password), form.mailAddress, form.isAdmin, form.url)
+    createAccount(form.userName, sha1(form.password), form.fullName, form.mailAddress, form.isAdmin, form.url)
     updateImage(form.userName, form.fileId, false)
     redirect("/admin/users")
   })
   
   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")
@@ -109,20 +134,34 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
 
   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)
+      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, memberNames)
+          // Update COLLABORATOR for group repositories
+          getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+            removeCollaborators(form.groupName, repositoryName)
+            memberNames.foreach { userName =>
+              addCollaborator(form.groupName, repositoryName, userName)
+            }
           }
         }
 
@@ -137,4 +176,4 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(params("userName")).isDefined
   })
 
-}
+}

src/main/scala/app/WikiController.scala

@@ -1,34 +1,40 @@
 package app
 
 import service._
-import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, JGitUtil, StringUtil}
+import util._
 import util.Directory._
 import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.api.Git
+import org.scalatra.FlashMapSupport
+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
 
-trait WikiControllerBase extends ControllerBase {
+trait WikiControllerBase extends ControllerBase with FlashMapSupport {
   self: WikiService with RepositoryService with ActivityService
     with CollaboratorsAuthenticator with ReferrerAuthenticator =>
 
-  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String)
+  case class WikiPageEditForm(pageName: String, content: String, message: Option[String], currentPageName: String, id: String)
   
   val newForm = mapping(
-    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), pagename, unique))),
-    "content"         -> trim(label("Content"            , text(required))),
-    "message"         -> trim(label("Message"            , optional(text()))),
-    "currentPageName" -> trim(label("Current page name"  , text()))
+    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename, unique))),
+    "content"         -> trim(label("Content"           , text(required, conflictForNew))),
+    "message"         -> trim(label("Message"           , optional(text()))),
+    "currentPageName" -> trim(label("Current page name" , text())),
+    "id"              -> trim(label("Latest commit id"  , text()))
   )(WikiPageEditForm.apply)
   
   val editForm = mapping(
-    "pageName"        -> trim(label("Page name"          , text(required, maxlength(40), pagename))),
-    "content"         -> trim(label("Content"            , text(required))),
-    "message"         -> trim(label("Message"            , optional(text()))),
-    "currentPageName" -> trim(label("Current page name"  , text(required)))
+    "pageName"        -> trim(label("Page name"         , text(required, maxlength(40), pagename))),
+    "content"         -> trim(label("Content"           , text(required, conflictForEdit))),
+    "message"         -> trim(label("Message"           , optional(text()))),
+    "currentPageName" -> trim(label("Current page name" , text(required))),
+    "id"              -> trim(label("Latest commit id"  , text(required)))
   )(WikiPageEditForm.apply)
   
   get("/:owner/:repository/wiki")(referrersOnly { repository =>
@@ -58,36 +64,60 @@ trait WikiControllerBase extends ControllerBase {
   
   get("/:owner/:repository/wiki/:page/_compare/:commitId")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
-    val commitId = params("commitId").split("\\.\\.\\.")
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      wiki.html.compare(Some(pageName), JGitUtil.getDiffs(git, commitId(0), commitId(1), 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"))
     }
   })
   
   get("/:owner/:repository/wiki/_compare/:commitId")(referrersOnly { repository =>
-    val commitId   = params("commitId").split("\\.\\.\\.")
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
 
     using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
-      wiki.html.compare(None, JGitUtil.getDiffs(git, commitId(0), commitId(1), true), repository)
+      wiki.html.compare(None, from, to, JGitUtil.getDiffs(git, from, to, true), repository,
+        hasWritePermission(repository.owner, repository.name, context.loginAccount), flash.get("info"))
     }
   })
-  
+
+  get("/:owner/:repository/wiki/:page/_revert/:commitId")(collaboratorsOnly { repository =>
+    val pageName = StringUtil.urlDecode(params("page"))
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
+
+    if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, Some(pageName))){
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}")
+    } else {
+      flash += "info" -> "This patch was not able to be reversed."
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_compare/${from}...${to}")
+    }
+  })
+
+  get("/:owner/:repository/wiki/_revert/:commitId")(collaboratorsOnly { repository =>
+    val Array(from, to) = params("commitId").split("\\.\\.\\.")
+
+    if(revertWikiPage(repository.owner, repository.name, from, to, context.loginAccount.get, None)){
+      redirect(s"/${repository.owner}/${repository.name}/wiki/")
+    } else {
+      flash += "info" -> "This patch was not able to be reversed."
+      redirect(s"/${repository.owner}/${repository.name}/wiki/_compare/${from}...${to}")
+    }
+  })
+
   get("/:owner/:repository/wiki/:page/_edit")(collaboratorsOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
     wiki.html.edit(pageName, getWikiPage(repository.owner, repository.name, pageName), repository)
   })
   
   post("/:owner/:repository/wiki/_edit", editForm)(collaboratorsOnly { (form, repository) =>
-    val loginAccount = context.loginAccount.get
-    
-    saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-                 form.content, loginAccount, form.message.getOrElse("")).map { commitId =>
-      updateLastActivityDate(repository.owner, repository.name)
-      recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+    defining(context.loginAccount.get){ loginAccount =>
+      saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
+          form.content, loginAccount, form.message.getOrElse(""), Some(form.id)).map { commitId =>
+        updateLastActivityDate(repository.owner, repository.name)
+        recordEditWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName, commitId)
+      }
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
     }
-
-    redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
   })
   
   get("/:owner/:repository/wiki/_new")(collaboratorsOnly {
@@ -95,25 +125,26 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   post("/:owner/:repository/wiki/_new", newForm)(collaboratorsOnly { (form, repository) =>
-    val loginAccount = context.loginAccount.get
-    
-    saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
-        form.content, context.loginAccount.get, form.message.getOrElse(""))
-    
-    updateLastActivityDate(repository.owner, repository.name)
-    recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+    defining(context.loginAccount.get){ loginAccount =>
+      saveWikiPage(repository.owner, repository.name, form.currentPageName, form.pageName,
+          form.content, loginAccount, form.message.getOrElse(""), None)
 
-    redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+      updateLastActivityDate(repository.owner, repository.name)
+      recordCreateWikiPageActivity(repository.owner, repository.name, loginAccount.userName, form.pageName)
+
+      redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(form.pageName)}")
+    }
   })
   
   get("/:owner/:repository/wiki/:page/_delete")(collaboratorsOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
-    val account  = context.loginAccount.get
-    
-    deleteWikiPage(repository.owner, repository.name, pageName, account.userName, account.mailAddress, s"Delete ${pageName}")
-    updateLastActivityDate(repository.owner, repository.name)
 
-    redirect(s"/${repository.owner}/${repository.name}/wiki")
+    defining(context.loginAccount.get){ loginAccount =>
+      deleteWikiPage(repository.owner, repository.name, pageName, loginAccount.fullName, loginAccount.mailAddress, s"Destroyed ${pageName}")
+      updateLastActivityDate(repository.owner, repository.name)
+
+      redirect(s"/${repository.owner}/${repository.name}/wiki")
+    }
   })
   
   get("/:owner/:repository/wiki/_pages")(referrersOnly { repository =>
@@ -131,19 +162,21 @@ trait WikiControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/wiki/_blob/*")(referrersOnly { repository =>
-    getFileContent(repository.owner, repository.name, multiParams("splat").head).map { content =>
-      contentType = "application/octet-stream"
-      content
+    val path = multiParams("splat").head
+
+    getFileContent(repository.owner, repository.name, path).map { bytes =>
+      contentType = FileUtil.getContentType(path, bytes)
+      bytes
     } getOrElse NotFound
   })
 
   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("-")){
@@ -153,5 +186,22 @@ trait WikiControllerBase extends ControllerBase {
       }
   }
 
+  private def conflictForNew: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = {
+      optionIf(targetWikiPage.nonEmpty){
+        Some("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, messages: Messages): Option[String] = {
+      optionIf(targetWikiPage.map(_.id != params("id")).getOrElse(false)){
+        Some("Someone has edited the wiki since you started. Please reload this page and re-apply your changes.")
+      }
+    }
+  }
+
+  private def targetWikiPage = getWikiPage(params("owner"), params("repository"), params("pageName"))
+
+}

src/main/scala/model/Account.scala

@@ -4,6 +4,7 @@ import scala.slick.driver.H2Driver.simple._
 
 object Accounts extends Table[Account]("ACCOUNT") {
   def userName = column[String]("USER_NAME", O PrimaryKey)
+  def fullName = column[String]("FULL_NAME")
   def mailAddress = column[String]("MAIL_ADDRESS")
   def password = column[String]("PASSWORD")
   def isAdmin = column[Boolean]("ADMINISTRATOR")
@@ -13,11 +14,13 @@ 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 ~ 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(
     userName: String,
+    fullName: String,
     mailAddress: String,
     password: String,
     isAdmin: Boolean,
@@ -26,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/service/AccountService.scala

@@ -9,9 +9,12 @@ import model.GroupMember
 import scala.Some
 import model.Account
 import util.LDAPUtil
+import org.slf4j.LoggerFactory
 
 trait AccountService {
 
+  private val logger = LoggerFactory.getLogger(classOf[AccountService])
+
   def authenticate(settings: SystemSettings, userName: String, password: String): Option[Account] =
     if(settings.ldapAuthentication){
       ldapAuthentication(settings, userName, password)
@@ -37,26 +40,35 @@ trait AccountService {
         // Create or update account by LDAP information
         getAccountByUserName(userName) match {
           case Some(x) => updateAccount(x.copy(mailAddress = mailAddress))
-          case None    => createAccount(userName, "", mailAddress, false, None)
+          case None    => createAccount(userName, "", userName, mailAddress, false, None)
         }
         getAccountByUserName(userName)
       }
-      case Left(errorMessage) => defaultAuthentication(userName, password)
+      case Left(errorMessage) => {
+        logger.info(s"LDAP Authentication Failed: ${errorMessage}")
+        defaultAuthentication(userName, password)
+      }
     }
   }
 
-  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 is mailAddress.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, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
+  def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String]): Unit =
     Accounts insert Account(
       userName       = userName,
       password       = password,
+      fullName       = fullName,
       mailAddress    = mailAddress,
       isAdmin        = isAdmin,
       url            = url,
@@ -64,20 +76,23 @@ 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.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, 
         account.mailAddress, 
         account.isAdmin,
         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)
@@ -89,6 +104,7 @@ trait AccountService {
     Accounts insert Account(
       userName       = groupName,
       password       = "",
+      fullName       = groupName,
       mailAddress    = groupName + "@devnull",
       isAdmin        = false,
       url            = url,
@@ -96,10 +112,11 @@ 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 = {
     Query(GroupMembers).filter(_.groupName is groupName.bind).delete
@@ -122,4 +139,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

src/main/scala/service/ActivityService.scala

@@ -109,11 +109,26 @@ trait ActivityService {
       s"[user:${activityUserName}] created tag [tag:${userName}/${repositoryName}#${tagName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
-  
+
+  def recordDeleteTagActivity(userName: String, repositoryName: String, activityUserName: String,
+                              tagName: String, commits: List[util.JGitUtil.CommitInfo]) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "delete_tag",
+      s"[user:${activityUserName}] deleted tag ${tagName} at [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+
   def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
       "create_branch",
-      s"[user:${activityUserName}] created branch [tag:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
+      s"[user:${activityUserName}] created branch [branch:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
+      None,
+      currentDate)
+
+  def recordDeleteBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
+    Activities.autoInc insert(userName, repositoryName, activityUserName,
+      "delete_branch",
+      s"[user:${activityUserName}] deleted branch ${branchName} at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)
 
@@ -141,7 +156,13 @@ trait ActivityService {
   def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
     CommitLog insert (userName, repositoryName, commitId)
   }
-  
+
+  def insertAllCommitIds(userName: String, repositoryName: String, commitIds: List[String]) =
+    CommitLog insertAll (commitIds.map(commitId => (userName, repositoryName, commitId)): _*)
+
+  def getAllCommitIds(userName: String, repositoryName: String): List[String] =
+    Query(CommitLog).filter(_.byRepository(userName, repositoryName)).map(_.commitId).list
+
   def existsCommitId(userName: String, repositoryName: String, commitId: String): Boolean =
     Query(CommitLog).filter(_.byPrimaryKey(userName, repositoryName, commitId)).firstOption.isDefined
   

src/main/scala/service/IssuesService.scala

@@ -49,12 +49,8 @@ trait IssuesService {
    * @return the count of the search result
    */
   def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
-                 repos: (String, String)*): Int = {
-    // TODO It must be _.length instead of map (_.issueId) list).length.
-    //       But it does not work on Slick 1.0.1 (worked on Slick 1.0.0).
-    //       https://github.com/slick/slick/issues/170
-    (searchIssueQuery(repos, condition, filterUser, onlyPullRequest) map (_.issueId) list).length
-  }
+                 repos: (String, String)*): Int =
+    Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
   /**
    * Returns the Map which contains issue count for each labels.
    *
@@ -253,6 +249,9 @@ trait IssuesService {
       }
       .update (content, currentDate)
 
+  def deleteComment(commentId: Int) =
+    IssueComments filter (_.byPrimaryKey(commentId)) delete
+
   def updateClosed(owner: String, repository: String, issueId: Int, closed: Boolean) =
     Issues
       .filter (_.byPrimaryKey(owner, repository, issueId))
@@ -354,10 +353,10 @@ object IssuesService {
     def apply(request: HttpServletRequest): IssueSearchCondition =
       IssueSearchCondition(
         param(request, "labels").map(_.split(" ").toSet).getOrElse(Set.empty),
-        param(request, "milestone").map(_ match {
+        param(request, "milestone").map{
           case "none" => None
-          case x      => Some(x.toInt)
-        }),
+          case x      => x.toIntOpt
+        },
         param(request, "for"),
         param(request, "state",     Seq("open", "closed")).getOrElse("open"),
         param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),

src/main/scala/service/PullRequestService.scala

@@ -9,15 +9,15 @@ trait PullRequestService { self: IssuesService =>
   import PullRequestService._
 
   def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
-    defining(getIssue(owner, repository, issueId.toString)){ issue =>
-      if(issue.isDefined){
-        Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption match {
-          case Some(pullreq) => Some((issue.get, pullreq))
-          case None          => None
-        }
-      } else None
+    getIssue(owner, repository, issueId.toString).flatMap{ issue =>
+      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
+        pullreq => (issue, pullreq)
+      }
     }
 
+  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) }
@@ -46,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 {
@@ -54,4 +66,4 @@ object PullRequestService {
 
   case class PullRequestCount(userName: String, count: Int)
 
-}
+}

src/main/scala/service/RepositoryService.scala

@@ -46,8 +46,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
@@ -120,7 +120,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
@@ -201,13 +201,10 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
-  // TODO It must be _.length instead of map (_.issueId) list).length.
-  //       But it does not work on Slick 1.0.1 (worked on Slick 1.0.0).
-  //       https://github.com/slick/slick/issues/170
   private def getForkedCount(userName: String, repositoryName: String): Int =
-    Query(Repositories).filter { t =>
+    Query(Repositories.filter { t =>
       (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
-    }.list.length
+    }.length).first
 
 
   def getForkedRepositories(userName: String, repositoryName: String): List[String] =

src/main/scala/service/RequestCache.scala

@@ -28,5 +28,10 @@ trait RequestCache {
     }
   }
 
+  def getAccountByMailAddress(mailAddress: String)(implicit context: app.Context): Option[Account] = {
+    context.cache(s"account.${mailAddress}"){
+      new AccountService {}.getAccountByMailAddress(mailAddress)
+    }
+  }
 }
 

src/main/scala/service/SystemSettingsService.scala

@@ -18,6 +18,8 @@ trait SystemSettingsService {
           smtp.user.foreach(props.setProperty(SmtpUser, _))
           smtp.password.foreach(props.setProperty(SmtpPassword, _))
           smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+          smtp.fromAddress.foreach(props.setProperty(SmtpFromAddress, _))
+          smtp.fromName.foreach(props.setProperty(SmtpFromName, _))
         }
       }
       props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
@@ -30,6 +32,8 @@ trait SystemSettingsService {
           props.setProperty(LdapBaseDN, ldap.baseDN)
           props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
           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)
@@ -52,7 +56,9 @@ trait SystemSettingsService {
             getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
             getOptionValue(props, SmtpUser, None),
             getOptionValue(props, SmtpPassword, None),
-            getOptionValue[Boolean](props, SmtpSsl, None)))
+            getOptionValue[Boolean](props, SmtpSsl, None),
+            getOptionValue(props, SmtpFromAddress, None),
+            getOptionValue(props, SmtpFromName, None)))
         } else {
           None
         },
@@ -65,7 +71,9 @@ trait SystemSettingsService {
             getOptionValue(props, LdapBindPassword, None),
             getValue(props, LdapBaseDN, ""),
             getValue(props, LdapUserNameAttribute, ""),
-            getValue(props, LdapMailAddressAttribute, "")))
+            getValue(props, LdapMailAddressAttribute, ""),
+            getOptionValue[Boolean](props, LdapTls, None),
+            getOptionValue(props, LdapKeystore, None)))
         } else {
           None
         }
@@ -93,14 +101,18 @@ object SystemSettingsService {
     bindPassword: Option[String],
     baseDN: String,
     userNameAttribute: String,
-    mailAttribute: String)
+    mailAttribute: String,
+    tls: Option[Boolean],
+    keystore: Option[String])
 
   case class Smtp(
     host: String,
     port: Option[Int],
     user: Option[String],
     password: Option[String],
-    ssl: Option[Boolean])
+    ssl: Option[Boolean],
+    fromAddress: Option[String],
+    fromName: Option[String])
 
   val DefaultSmtpPort = 25
   val DefaultLdapPort = 389
@@ -113,6 +125,8 @@ object SystemSettingsService {
   private val SmtpUser = "smtp.user"
   private val SmtpPassword = "smtp.password"
   private val SmtpSsl = "smtp.ssl"
+  private val SmtpFromAddress = "smtp.from_address"
+  private val SmtpFromName = "smtp.from_name"
   private val LdapAuthentication = "ldap_authentication"
   private val LdapHost = "ldap.host"
   private val LdapPort = "ldap.port"
@@ -121,6 +135,8 @@ object SystemSettingsService {
   private val LdapBaseDN = "ldap.baseDN"
   private val LdapUserNameAttribute = "ldap.username_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

@@ -29,23 +29,21 @@ trait WebHookService {
   def deleteWebHookURL(owner: String, repository: String, url :String): Unit =
     Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete
 
-  def callWebHook(owner: String, repository: String, payload: WebHookPayload): Unit = {
+  def callWebHook(owner: String, repository: String, webHookURLs: List[WebHook], payload: WebHookPayload): Unit = {
     import org.json4s._
     import org.json4s.jackson.Serialization
     import org.json4s.jackson.Serialization.{read, write}
     import org.apache.http.client.methods.HttpPost
-    import org.apache.http.impl.client.DefaultHttpClient
+    import org.apache.http.impl.client.HttpClientBuilder
     import scala.concurrent._
     import ExecutionContext.Implicits.global
 
     logger.debug("start callWebHook")
     implicit val formats = Serialization.formats(NoTypeHints)
 
-    val webHookURLs = getWebHookURLs(owner, repository)
-
     if(webHookURLs.nonEmpty){
       val json = write(payload)
-      val httpClient = new DefaultHttpClient()
+      val httpClient = HttpClientBuilder.create.build
 
       webHookURLs.foreach { webHookUrl =>
         val f = future {
@@ -76,14 +74,16 @@ 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)

src/main/scala/service/WikiService.scala

@@ -1,11 +1,20 @@
 package service
 
-import java.io.File
 import java.util.Date
 import org.eclipse.jgit.api.Git
 import org.apache.commons.io.FileUtils
-import util.{Directory, JGitUtil, LockUtil}
-import util.ControlUtil._
+import util.{PatchUtil, Directory, JGitUtil, LockUtil}
+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._
+
 
 object WikiService {
   
@@ -16,8 +25,9 @@ object WikiService {
    * @param content the page content
    * @param committer the last committer
    * @param time the last modified time
+   * @param id the latest commit id
    */
-  case class WikiPageInfo(name: String, content: String, committer: String, time: Date)
+  case class WikiPageInfo(name: String, content: String, committer: String, time: Date, id: String)
   
   /**
    * The model for wiki page history.
@@ -38,13 +48,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")
-          } 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)
         }
       }
     }
@@ -56,7 +61,7 @@ trait WikiService {
     using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
       optionIf(!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)
+          WikiPageInfo(file.name, new String(git.getRepository.open(file.id).getBytes, "UTF-8"), file.committer, file.time, file.commitId)
         }
       }
     }
@@ -89,40 +94,169 @@ trait WikiService {
         .sortBy(x => x)
     }
   }
-  
+
+  /**
+   * Reverts specified changes.
+   */
+  def revertWikiPage(owner: String, repository: String, from: String, to: String,
+                     committer: model.Account, pageName: Option[String]): Boolean = {
+
+    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}"))
+
+          val newTreeIter = new CanonicalTreeParser
+          newTreeIter.reset(reader, git.getRepository.resolve(to + "^{tree}"))
+
+          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
+            pageName match {
+              case Some(x) => diff.getNewPath == x + ".md"
+              case None    => true
+            }
+          }
+
+          val patch = using(new java.io.ByteArrayOutputStream()){ out =>
+            val formatter = new DiffFormatter(out)
+            formatter.setRepository(git.getRepository)
+            formatter.format(diffs.asJava)
+            new String(out.toByteArray, "UTF-8")
+          }
+
+          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): Option[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 =>
-            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.userName, committer.mailAddress).setMessage(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.getContent(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
+                }
               }
             }
           }
         }
+
+        optionIf(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)
+        }
       }
     }
   }
@@ -132,36 +266,35 @@ 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)
+      LockUtil.lock(s"${owner}/${repository}/wiki"){
+        using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+          val builder  = DirCache.newInCore.builder()
+          val inserter = git.getRepository.newObjectInserter()
+          val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
+          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.setAuthor(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

@@ -1,9 +1,9 @@
 package servlet
 
 import java.io.File
-import java.sql.Connection
+import java.sql.{DriverManager, Connection}
 import org.apache.commons.io.FileUtils
-import javax.servlet.ServletContextEvent
+import javax.servlet.{ServletContext, ServletContextListener, ServletContextEvent}
 import org.apache.commons.io.IOUtils
 import org.slf4j.LoggerFactory
 import util.Directory._
@@ -50,6 +50,8 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    Version(1, 8),
+    Version(1, 7),
     Version(1, 6),
     Version(1, 5),
     Version(1, 4),
@@ -73,7 +75,8 @@ object AutoUpdate {
     },
     Version(1, 2),
     Version(1, 1),
-    Version(1, 0)
+    Version(1, 0),
+    Version(0, 0)
   )
   
   /**
@@ -84,7 +87,7 @@ 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.
@@ -99,37 +102,39 @@ object AutoUpdate {
         }
         case _ => Version(0, 0)
       }
-    } else {
-      Version(0, 0)
-    }
-    
-  }  
+    } else Version(0, 0)
+  }
   
 }
 
 /**
- * Start H2 database and update schema automatically.
+ * Update database schema automatically in the context initializing.
  */
-class AutoUpdateListener extends org.h2.server.web.DbStarter {
+class AutoUpdateListener extends ServletContextListener {
   import AutoUpdate._
   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}")
-    super.contextInitialized(event)
-    logger.debug("H2 started")
-    
+
     logger.debug("Start schema update")
-    defining(getConnection()){ conn =>
+    defining(getConnection(event.getServletContext)){ conn =>
       try {
         defining(getCurrentVersion()){ currentVersion =>
           if(currentVersion == headVersion){
             logger.debug("No update")
+          } else if(!versions.contains(currentVersion)){
+            logger.warn(s"Skip migration because ${currentVersion.versionString} is illegal version.")
           } else {
             versions.takeWhile(_ != currentVersion).reverse.foreach(_.update(conn))
             FileUtils.writeStringToFile(versionFile, headVersion.versionString, "UTF-8")
             conn.commit()
-            logger.debug("Updated from " + currentVersion.versionString + " to " + headVersion.versionString)
+            logger.debug(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
           }
         }
       } catch {
@@ -142,5 +147,15 @@ class AutoUpdateListener extends org.h2.server.web.DbStarter {
     }
     logger.debug("End schema update")
   }
-  
-}
+
+  def contextDestroyed(sce: ServletContextEvent): Unit = {
+    // Nothing to do.
+  }
+
+  private def getConnection(servletContext: ServletContext): Connection =
+    DriverManager.getConnection(
+      servletContext.getInitParameter("db.url"),
+      servletContext.getInitParameter("db.user"),
+      servletContext.getInitParameter("db.password"))
+
+}

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -15,6 +15,7 @@ import util.Implicits._
 import service._
 import WebHookService._
 import org.eclipse.jgit.api.Git
+import util.JGitUtil.CommitInfo
 
 /**
  * Provides Git repository via HTTP.
@@ -42,7 +43,7 @@ class GitRepositoryServlet extends GitServlet {
 
       def getServletContext(): ServletContext = config.getServletContext
       def getServletName(): String = config.getServletName
-    });
+    })
 
     super.init(config)
   }
@@ -77,59 +78,111 @@ 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 {
+  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 =>
-        val commits = JGitUtil.getCommitLog(git, command.getOldId.name, command.getNewId.name)
+        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("/")
-        
-        // apply issue comment
-        val newCommits = commits.flatMap { commit =>
-          if(!existsCommitId(owner, repository, commit.id)){
-            insertCommitId(owner, repository, commit.id)
-            "(^|\\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")
-              }
+        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)
             }
-            Some(commit)
-          } else None
-        }.toList
-        
+          }
+        } else {
+          commits.flatMap { commit =>
+            optionIf(!existsCommitId(owner, repository, commit.id)){
+              createIssueComment(commit)
+              Some(commit)
+            }
+          }
+        }
+
+        // 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, refName(2))
-              recordPushActivity(owner, repository, userName, refName(2), newCommits)
-            }
-            case ReceiveCommand.Type.UPDATE => recordPushActivity(owner, repository, userName, refName(2), newCommits)
+            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)
             case _ =>
           }
         } else if(refName(1) == "tags"){
           command.getType match {
-            case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, refName(2), newCommits)
+            case ReceiveCommand.Type.CREATE => recordCreateTagActivity(owner, repository, userName, branchName, newCommits)
+            case ReceiveCommand.Type.DELETE => recordDeleteTagActivity(owner, repository, userName, branchName, newCommits)
+            case _ =>
+          }
+        }
+
+        if(refName(1) == "heads"){
+          command.getType match {
+            case ReceiveCommand.Type.CREATE |
+                 ReceiveCommand.Type.UPDATE |
+                 ReceiveCommand.Type.UPDATE_NONFASTFORWARD =>
+              updatePullRequests(branchName)
             case _ =>
           }
         }
 
         // call web hook
-        val payload = WebHookPayload(
-          git,
-          command.getRefName,
-          getRepository(owner, repository, baseURL).get,
-          newCommits,
-          getAccountByUserName(owner).get)
+        val webHookURLs = getWebHookURLs(owner, repository)
+        if(webHookURLs.nonEmpty){
+          val payload = WebHookPayload(
+            git,
+            getAccountByUserName(userName).get,
+            command.getRefName,
+            getRepository(owner, repository, baseURL).get,
+            newCommits,
+            getAccountByUserName(owner).get)
 
-        callWebHook(owner, repository, payload)
+          callWebHook(owner, repository, webHookURLs, payload)
+        }
       }
     }
     // 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")
+      }
+    }
+  }
+
+  /**
+   * 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/util/ControlUtil.scala

@@ -3,6 +3,7 @@ package util
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
+import org.eclipse.jgit.transport.RefSpec
 
 /**
  * Provides control facilities.
@@ -37,6 +38,17 @@ object ControlUtil {
   def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
     try f(treeWalk) finally treeWalk.release()
 
+
+  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()
+    }
+  }
+
   def executeIf(condition: => Boolean)(action: => Unit): Boolean =
     if(condition){
       action

src/main/scala/util/Directory.scala

@@ -8,9 +8,15 @@ import util.ControlUtil._
  */
 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 => new File(System.getProperty("user.home"), "gitbucket")
+    }
   }).getAbsolutePath
 
   val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")
@@ -56,25 +62,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

@@ -1,9 +1,8 @@
 package util
 
-import org.apache.commons.io.{IOUtils, FileUtils}
+import org.apache.commons.io.FileUtils
 import java.net.URLConnection
 import java.io.File
-import org.apache.commons.compress.archivers.zip.{ZipArchiveEntry, ZipArchiveOutputStream}
 import util.ControlUtil._
 
 object FileUtil {
@@ -16,29 +15,39 @@ object FileUtil {
       }
     }
 
+  def getContentType(name: String, bytes: Array[Byte]): String = {
+    defining(getMimeType(name)){ mimeType =>
+      if(mimeType == "application/octet-stream" && isText(bytes)){
+        "text/plain"
+      } else {
+        mimeType
+      }
+    }
+  }
+
   def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
   
   def isLarge(size: Long): Boolean = (size > 1024 * 1000)
   
   def isText(content: Array[Byte]): Boolean = !content.contains(0)
 
-  def createZipFile(dest: File, dir: File): Unit = {
-    def addDirectoryToZip(out: ZipArchiveOutputStream, dir: File, path: String): Unit = {
-      dir.listFiles.map { file =>
-        if(file.isFile){
-          out.putArchiveEntry(new ZipArchiveEntry(path + "/" + file.getName))
-          out.write(FileUtils.readFileToByteArray(file))
-          out.closeArchiveEntry
-        } else if(file.isDirectory){
-          addDirectoryToZip(out, file, path + "/" + file.getName)
-        }
-      }
-    }
-
-    using(new ZipArchiveOutputStream(dest)){ out =>
-      addDirectoryToZip(out, dir, dir.getName)
-    }
-  }
+//  def createZipFile(dest: File, dir: File): Unit = {
+//    def addDirectoryToZip(out: ZipArchiveOutputStream, dir: File, path: String): Unit = {
+//      dir.listFiles.map { file =>
+//        if(file.isFile){
+//          out.putArchiveEntry(new ZipArchiveEntry(path + "/" + file.getName))
+//          out.write(FileUtils.readFileToByteArray(file))
+//          out.closeArchiveEntry
+//        } else if(file.isDirectory){
+//          addDirectoryToZip(out, file, path + "/" + file.getName)
+//        }
+//      }
+//    }
+//
+//    using(new ZipArchiveOutputStream(dest)){ out =>
+//      addDirectoryToZip(out, dir, dir.getName)
+//    }
+//  }
 
   def getFileName(path: String): String = defining(path.lastIndexOf('/')){ i =>
     if(i >= 0) path.substring(i + 1) else path
@@ -50,4 +59,14 @@ object FileUtil {
       case _ => ""
     }
 
-}
+  def withTmpDir[A](dir: File)(action: File => A): A = {
+    if(dir.exists()){
+      FileUtils.deleteDirectory(dir)
+    }
+    try{
+      action(dir)
+    }finally{
+      FileUtils.deleteDirectory(dir)
+    }
+  }
+}

src/main/scala/util/Implicits.scala

@@ -41,6 +41,12 @@ object Implicits {
       }
       sb.toString
     }
+
+    def toIntOpt: Option[Int] = try {
+      Option(Integer.parseInt(value))
+    } catch {
+      case e: NumberFormatException => None
+    }
   }
 
   implicit class RichRequest(request: HttpServletRequest){
@@ -69,4 +75,4 @@ object Implicits {
     }
   }
 
-}
+}

src/main/scala/util/JGitUtil.scala

@@ -15,6 +15,7 @@ import org.eclipse.jgit.errors.MissingObjectException
 import java.util.Date
 import org.eclipse.jgit.api.errors.NoHeadException
 import service.RepositoryService
+import org.eclipse.jgit.dircache.DirCacheEntry
 
 /**
  * Provides complex JGit operations.
@@ -43,8 +44,10 @@ object JGitUtil {
    * @param message the last commit message
    * @param commitId the last commit id
    * @param committer the last committer name
+   * @param mailAddress the committer's mail address
    */
-  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String, committer: String)
+  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
+                      committer: String, mailAddress: String)
 
   /**
    * The commit data.
@@ -206,7 +209,8 @@ object JGitUtil {
         commits(path).getCommitterIdent.getWhen,
         commits(path).getShortMessage,
         commits(path).getName,
-        commits(path).getCommitterIdent.getName)
+        commits(path).getCommitterIdent.getName,
+        commits(path).getCommitterIdent.getEmailAddress)
     }.sortWith { (file1, file2) =>
       (file1.isDirectory, file2.isDirectory) match {
         case (true , false) => true
@@ -453,11 +457,41 @@ object JGitUtil {
   def getDefaultBranch(git: Git, repository: RepositoryService.RepositoryInfo,
                        revstr: String = ""): Option[(ObjectId, String)] = {
     Seq(
-      if(revstr.isEmpty) repository.repository.defaultBranch else revstr,
-      repository.branchList.head
-    ).map { rev =>
-      (git.getRepository.resolve(rev), rev)
+      Some(if(revstr.isEmpty) repository.repository.defaultBranch else revstr),
+      repository.branchList.headOption
+    ).flatMap {
+      case Some(rev) => Some((git.getRepository.resolve(rev), rev))
+      case None      => None
     }.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
+  }
+
 }

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,7 +13,8 @@ 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.
@@ -22,13 +25,15 @@ object LDAPUtil {
       ldapSettings.host,
       ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
       ldapSettings.bindDN.getOrElse(""),
-      ldapSettings.bindPassword.getOrElse("")
+      ldapSettings.bindPassword.getOrElse(""),
+      ldapSettings.tls.getOrElse(false),
+      ldapSettings.keystore.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")
+            case None => Left("User does not exist.")
           }
         }
       }
@@ -41,7 +46,9 @@ object LDAPUtil {
       ldapSettings.host,
       ldapSettings.port.getOrElse(SystemSettingsService.DefaultLdapPort),
       userDN,
-      password
+      password,
+      ldapSettings.tls.getOrElse(false),
+      ldapSettings.keystore.getOrElse("")
     ) match {
       case Some(conn) => {
         withConnection(conn) { conn =>
@@ -55,15 +62,41 @@ object LDAPUtil {
     }
   }
 
-  private def bind(host: String, port: Int, dn: String, password: String): Option[LDAPConnection] = {
-    val conn: LDAPConnection = new LDAPConnection
+  private def bind(host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String): Option[LDAPConnection] = {
+    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)
     } catch {
       case e: Exception => {
-        if (conn.isConnected) conn.disconnect()
+        // Provide more information if something goes wrong
+        logger.info("" + e)
+
+        if (conn.isConnected) {
+          conn.disconnect()
+        }
+
         None
       }
     }

src/main/scala/util/Notifier.scala

@@ -9,6 +9,7 @@ import app.Context
 import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
 import servlet.Database
 import SystemSettingsService.Smtp
+import _root_.util.ControlUtil.defining
 
 trait Notifier extends RepositoryService with AccountService with IssuesService {
   def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
@@ -68,25 +69,34 @@ class Mailer(private val smtp: Smtp) extends Notifier {
     val database = Database(context.request.getServletContext)
 
     val f = future {
-      val email = new HtmlEmail
-      email.setHostName(smtp.host)
-      email.setSmtpPort(smtp.port.get)
-      smtp.user.foreach { user =>
-        email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
-      }
-      smtp.ssl.foreach { ssl =>
-        email.setSSLOnConnect(ssl)
-      }
-      email.setFrom("notifications@gitbucket.com", context.loginAccount.get.userName)
-      email.setHtmlMsg(msg(view.Markdown.toHtml(content, r, false, true)))
-
       // TODO Can we use the Database Session in other than Transaction Filter?
       database withSession {
         getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
-          email.setSubject(s"[${r.name}] ${issue.title} (#${issueId})")
-          recipients(issue) {
-            email.getToAddresses.clear
-            email.addTo(_).send
+          defining(
+              s"[${r.name}] ${issue.title} (#${issueId})" ->
+              msg(view.Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
+            recipients(issue) { to =>
+              val email = new HtmlEmail
+              email.setHostName(smtp.host)
+              email.setSmtpPort(smtp.port.get)
+              smtp.user.foreach { user =>
+                email.setAuthenticator(new DefaultAuthenticator(user, smtp.password.getOrElse("")))
+              }
+              smtp.ssl.foreach { ssl =>
+                email.setSSLOnConnect(ssl)
+              }
+              smtp.fromAddress
+                .map (_ -> smtp.fromName.orNull)
+                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
+                .foreach { case (address, name) =>
+                  email.setFrom(address, name)
+                }
+              email.setCharset("UTF-8")
+              email.setSubject(subject)
+              email.setHtmlMsg(msg)
+
+              email.addTo(to).send
+            }
           }
         }
       }

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,8 +9,8 @@ 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] =
-      if(!value.matches("^[a-zA-Z0-9\\-_]+$")){
+    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("-")){
         Some(s"${name} starts with invalid character.")
@@ -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

@@ -13,17 +13,31 @@ trait AvatarImageProvider { self: RequestCache =>
   protected def getAvatarImageHtml(userName: String, size: Int,
       mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
 
-    val src = getAccountByUserName(userName).map { account =>
-      if(account.image.isEmpty && getSystemSettings().gravatar){
-        s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
-      } else {
-        s"""${context.path}/${userName}/_avatar"""
+    val src = if(mailAddress.isEmpty){
+      // by user name
+      getAccountByUserName(userName).map { account =>
+        if(account.image.isEmpty && getSystemSettings().gravatar){
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/${account.userName}/_avatar"""
+        }
+      } getOrElse {
+        s"""${context.path}/_unknown/_avatar"""
       }
-    } getOrElse {
-      if(mailAddress.nonEmpty && getSystemSettings().gravatar){
-        s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
-      } else {
-        s"""${context.path}/${userName}/_avatar"""
+    } else {
+      // by mail address
+      getAccountByMailAddress(mailAddress).map { account =>
+        if(account.image.isEmpty && getSystemSettings().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"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/_unknown/_avatar"""
+        }
       }
     }
 

src/main/scala/view/LinkConverter.scala

@@ -14,20 +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 =>
-        if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){
-          Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
-        } else {
-          Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+      .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"""<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

@@ -1,12 +1,14 @@
 package view
 
 import util.StringUtil
+import util.ControlUtil._
+import util.Directory._
 import org.parboiled.common.StringUtils
 import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
 import scala.collection.JavaConverters._
-import service.RequestCache
+import service.{RequestCache, WikiService}
 
 object Markdown {
 
@@ -17,11 +19,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)
@@ -29,7 +31,7 @@ object Markdown {
 }
 
 class GitBucketLinkRender(context: app.Context, repository: service.RepositoryService.RepositoryInfo,
-                          enableWikiLink: Boolean) extends LinkRenderer {
+                          enableWikiLink: Boolean) extends LinkRenderer with WikiService {
   override def render(node: WikiLinkNode): Rendering = {
     if(enableWikiLink){
       try {
@@ -40,8 +42,14 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
         } else {
           (text, text)
         }
+
         val url = repository.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/" + StringUtil.urlEncode(page)
-        new Rendering(url, label)
+
+        if(getWikiPage(repository.owner, repository.name, page).isDefined){
+          new Rendering(url, label)
+        } else {
+          new Rendering(url, label).withAttribute("class", "absent")
+        }
       } catch {
         case e: java.io.UnsupportedEncodingException => throw new IllegalStateException
       }
@@ -113,4 +121,4 @@ class GitBucketHtmlSerializer(
     }
   }
 
-}
+}

src/main/scala/view/helpers.scala

@@ -9,12 +9,12 @@ import service.RequestCache
  * Provides helper methods for Twirl templates.
  */
 object helpers extends AvatarImageProvider with LinkConverter with RequestCache {
-  
+
   /**
    * Format java.util.Date to "yyyy-MM-dd HH:mm:ss".
    */
   def datetime(date: Date): String = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)
-  
+
   /**
    * Format java.util.Date to "yyyy-MM-dd".
    */
@@ -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,16 +61,31 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
       value
     }
 
+  import scala.util.matching.Regex._
+  implicit class RegexReplaceString(s: String) {
+    def replaceAll(pattern: String, replacer: (Match) => String): String = {
+      pattern.r.replaceAllIn(s, replacer)
+    }
+  }
+
+  /**
+   * 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>""")
       .replaceAll("\\[pullreq:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]" , s"""<a href="${context.path}/$$1/$$2/pull/$$3">$$1/$$2#$$3</a>""")
       .replaceAll("\\[repo:([^\\s]+?)/([^\\s]+?)\\]"             , s"""<a href="${context.path}/$$1/$$2\">$$1/$$2</a>""")
-      .replaceAll("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]", s"""<a href="${context.path}/$$1/$$2/tree/$$3">$$3</a>""")
-      .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]"   , s"""<a href="${context.path}/$$1/$$2/tree/$$3">$$3</a>""")
-      .replaceAll("\\[user:([^\\s]+?)\\]"                        , s"""<a href="${context.path}/$$1">$$1</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]+?)\\]"                        , (m: Match) => user(m.group(1)).body)
     )
 
+  /**
+   * URL encode except '/'.
+   */
+  def encodeRefName(value: String): String = StringUtil.urlEncode(value).replace("%2F", "/")
+
   def urlEncode(value: String): String = StringUtil.urlEncode(value)
 
   def urlEncode(value: Option[String]): String = value.map(urlEncode).getOrElse("")
@@ -87,6 +106,33 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    */
   def assets(implicit context: app.Context): String = s"${context.path}/assets"
 
+  /**
+   * 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 =
+    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

@@ -13,7 +13,7 @@
       <div class="span6">
         @if(account.isEmpty){
           <fieldset>
-            <label for="userName" class="strong">User name</label>
+            <label for="userName" class="strong">Username:</label>
             <input type="text" name="userName" id="userName" value=""/>
             <span id="error-userName" class="error"></span>
           </fieldset>
@@ -23,33 +23,42 @@
             <label for="password" class="strong">
               Password
               @if(account.nonEmpty){
-                (Input to change 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="mailAddress" class="strong">Mail Address</label>
+          <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>
+          <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>
+          <label for="avatar" class="strong">Image (optional):</label>
           @helper.html.uploadavatar(account)
         </fieldset>
       </div>
     </div>
     <fieldset class="margin">
       @if(account.isDefined){
+        <div class="pull-right">
+          <a href="@path/@account.get.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.get.userName)" class="btn">Cancel</a>
       } else {
@@ -58,3 +67,10 @@
     </fieldset>
   </form>
 }
+<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/main.scala.html

@@ -7,7 +7,8 @@
       <div class="span4">
         <div class="block">
           <div class="account-image">@avatar(account.userName, 200)</div>
-          <div class="block-header">@account.userName</div>
+          <div class="account-fullname">@account.fullName</div>
+          <div class="account-username">@account.userName</div>
         </div>
         <div class="block">
           @if(account.url.isDefined){

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

@@ -13,13 +13,13 @@
           <!--====================================================================-->
           <label class="strong">Account registration</label>
           <fieldset>
-            <label>
+            <label class="radio">
               <input type="radio" name="allowAccountRegistration" value="true"@if(settings.allowAccountRegistration){ checked}>
-              <span class="strong">Allow</span> - Users can create account by themselves.
+              <span class="strong">Allow</span> - Users can create accounts by themselves.
             </label>
-            <label>
+            <label class="radio">
               <input type="radio" name="allowAccountRegistration" value="false"@if(!settings.allowAccountRegistration){ checked}>
-              <span class="strong">Deny</span> - Only administrators can create account.
+              <span class="strong">Deny</span> - Only administrators can create accounts.
             </label>
           </fieldset>
           <!--====================================================================-->
@@ -28,9 +28,9 @@
           <hr>
           <label class="strong">Services</label>
           <fieldset>
-            <label>
+            <label class="checkbox">
               <input type="checkbox" name="gravatar"@if(settings.gravatar){ checked}/>
-              Gravatar
+              Use Gravatar for Profile-Images
             </label>
           </fieldset>
           <!--====================================================================-->
@@ -39,7 +39,7 @@
           <hr>
           <label class="strong">Authentication</label>
           <fieldset>
-            <label>
+            <label class="checkbox">
               <input type="checkbox" id="ldapAuthentication" name="ldapAuthentication"@if(settings.ldap){ checked}/>
               LDAP
             </label>
@@ -94,6 +94,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 -->
@@ -101,7 +115,7 @@
           <hr>
           <label class="strong">Notification email</label>
           <fieldset>
-            <label>
+            <label class="checkbox">
               <input type="checkbox" id="notification" name="notification"@if(settings.notification){ checked}/>
               Send notifications
             </label>
@@ -140,6 +154,18 @@
                 </label>
               </div>
             </div>
+            <div class="control-group">
+              <label class="control-label" for="fromAddress">FROM Address</label>
+              <div class="controls">
+                <input type="text" id="fromAddress" name="smtp.fromAddress" value="@settings.smtp.map(_.fromAddress)"/>
+              </div>
+            </div>
+            <div class="control-group">
+              <label class="control-label" for="fromName">FROM Name</label>
+              <div class="controls">
+                <input type="text" id="fromName" name="smtp.fromName" value="@settings.smtp.map(_.fromName)"/>
+              </div>
+            </div>
           </div>
         </div>
       </div>

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

@@ -8,12 +8,22 @@
         <div class="span7">
           <fieldset>
             <label for="groupName" class="strong">Group name</label>
-            <span id="error-groupName" class="error"></span>
+            <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>
-            <span id="error-url" class="error"></span>
+            <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>

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

@@ -6,9 +6,17 @@
       <div class="row-fluid">
         <div class="span6">
           <fieldset>
-            <label for="userName" class="strong">Username</label>
-            <span id="error-userName" class="error"></span>
+            <label for="userName" class="strong">Username:</label>
+            <div>
+              <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>
@@ -17,28 +25,42 @@
                 @if(account.isDefined){
                   (Input to change password)
                 }
+                :
               </label>
-              <span id="error-password" class="error"></span>
+              <div>
+                <span id="error-password" class="error"></span>
+              </div>
               <input type="password" name="password" id="password" value="" autocomplete="off"/>
             </fieldset>
           }
           <fieldset>
-            <label for="mailAddress" class="strong">Mail Address</label>
-            <span id="error-mailAddress" class="error"></span>
+            <label for="fullName" class="strong">Full Name:</label>
+            <div>
+              <span id="error-fullName" class="error"></span>
+            </div>
+            <input type="text" name="fullName" id="fullName" value="@account.map(_.fullName)"/>
+          </fieldset>
+          <fieldset>
+            <label for="mailAddress" class="strong">Mail Address:</label>
+            <div>
+              <span id="error-mailAddress" class="error"></span>
+            </div>
             <input type="text" name="mailAddress" id="mailAddress" value="@account.map(_.mailAddress)"/>
           </fieldset>
           <fieldset>
-            <label class="strong">User Type</label>
-            <label for="userType_Normal">
+            <label class="strong">User Type:</label>
+            <label class="radio" for="userType_Normal">
               <input type="radio" name="isAdmin" id="userType_Normal" value="false"@if(account.isEmpty || !account.get.isAdmin){ checked}/> Normal
             </label>
-            <label for="userType_Admin">
+            <label class="radio" for="userType_Admin">
               <input type="radio" name="isAdmin" id="userType_Admin" value="true"@if(account.isDefined && account.get.isAdmin){ checked}/> Administrator
             </label>
           </fieldset>
           <fieldset>
-            <label class="strong">URL (Optional)</label>
-            <span id="error-url" class="error"></span>
+            <label class="strong">URL (Optional):</label>
+            <div>
+              <span id="error-url" class="error"></span>
+            </div>
             <input type="text" name="url" id="url" style="width: 400px;" value="@account.map(_.url)"/>
           </fieldset>
         </div>
@@ -55,4 +77,4 @@
       </fieldset>
     </form>
   }
-}
+}

src/main/twirl/header.scala.html

@@ -1,17 +1,24 @@
 @(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-<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>
+
+@if(repository.commitCount > 0){
+  <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>
+    </div>
   </div>
-</div>
+}
 <div class="head">
-  <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
   @if(repository.repository.isPrivate){
-    <i class="icon-lock"></i>
+      <i class="icon-lock"></i>
   }
+  @if(!repository.repository.isPrivate){
+      <i class="icon-eye-open"></i>
+  }
+  <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
+  
   @defining(repository.repository){ x =>
     @if(repository.repository.originRepositoryName.isDefined){
       <div class="forked">

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

@@ -16,7 +16,9 @@
         case "merge_pullreq"     => detailActivity(activity, "activity-merge.png")
         case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
         case "create_branch"     => simpleActivity(activity, "activity-branch.png")
+        case "delete_branch"     => simpleActivity(activity, "activity-delete.png")
         case "create_tag"        => simpleActivity(activity, "activity-tag.png")
+        case "delete_tag"        => simpleActivity(activity, "activity-delete.png")
         case "fork"              => simpleActivity(activity, "activity-fork.png")
         case "push"  => customActivity(activity, "activity-commit.png"){
           <div class="small activity-message">

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

@@ -1,5 +1,5 @@
 @(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean, enableRefsLink: Boolean,
-  style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
+  style: String = "", placeholder: String = "Leave a comment", elastic: Boolean = false)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <div class="tabbable">
@@ -27,6 +27,10 @@
 <script src="@assets/google-code-prettify/prettify.js"></script>
 <script>
 $(function(){
+  @if(elastic){
+    $('#content').elastic();
+  }
+
   $('#preview').click(function(){
     $('#preview-area').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
     $.post('@url(repository)/_preview', {

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

@@ -15,6 +15,7 @@
   </label>
 }
 <input type="hidden" name="fileId" value=""/>
+@if(account.isEmpty || account.get.image.isEmpty){
 <script>
 $(function(){
   var dropzone = new Dropzone('div#clickable', {
@@ -32,6 +33,7 @@ $(function(){
   });
 });
 </script>
+}
 <style type="text/css">
 div.dz-filename, div.dz-size, div.dz-progress, div.dz-success-mark, div.dz-error-mark, div.dz-error-message {
   display: none;

src/main/twirl/index.scala.html

@@ -31,6 +31,12 @@
           @userRepositories.map { repository =>
             <tr>
               <td>
+                @if(repository.repository.isPrivate){
+                  <i class="icon-lock"></i>
+                }
+                @if(!repository.repository.isPrivate){
+                  <i class="icon-eye-open"></i>
+                }
                 @if(repository.owner == loginAccount.get.userName){
                   <a href="@url(repository)"><span class="strong">@repository.name</span></a>
                 } else {
@@ -57,6 +63,12 @@
         @recentRepositories.map { repository =>
           <tr>
             <td>
+              @if(repository.repository.isPrivate){
+              <i class="icon-lock"></i>
+              }
+              @if(!repository.repository.isPrivate){
+              <i class="icon-eye-open"></i>
+              }
               <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
             </td>
           </tr>

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

@@ -8,7 +8,7 @@
     <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
       <div class="box issue-comment-box">
       <div class="box-content">
-        @helper.html.preview(repository, "", false, true, "width: 680px; height: 100px;")
+        @helper.html.preview(repository, "", false, true, "width: 680px; height: 100px; max-height: 150px;", elastic = true)
       </div>
     </div>
     <div class="pull-right">

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

@@ -11,16 +11,24 @@
     <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") commented
         <span class="pull-right">
           @datetime(comment.registeredDate)
           @if(comment.action != "commit" && comment.action != "merge" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
-            <a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil"></i></a>
+            <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>
           }
         </span>
       </div>
       <div class="box-content"class="issue-content" id="commentContent-@comment.commentId">
-        @markdown(comment.content, repository, false, true)
+        @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){
+          @defining(comment.content.substring(comment.content.length - 40)){ id =>
+            <div class="pull-right"><a href="@path/@repository.owner/@repository.name/commit/@id" class="monospace">@id.substring(0, 7)</a></div>
+            @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true)
+          }
+        } else {
+          @markdown(comment.content, repository, false, true)
+        }
       </div>
     </div>
   }
@@ -28,7 +36,7 @@
     <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>
       @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>
       } else {
@@ -42,9 +50,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>
   }
@@ -52,7 +60,7 @@
     <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>
   }
 }
@@ -69,5 +77,18 @@ $(function(){
     });
     return false;
   });
+  $('i.icon-remove-circle').click(function(){
+    if(confirm('Are you sure you want to delete this?')) {
+      var id = $(this).closest('a').data('comment-id');
+      $.post('@url(repository)/issue_comments/delete/' + id,
+      function(data){
+        if(data > 0) {
+          $('#comment-' + id).prev('div.issue-avatar-image').remove();
+          $('#comment-' + id).remove();
+        }
+      });
+    }
+    return false;
+  });
 });
 </script>

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

@@ -56,7 +56,7 @@
             </div>
           </div>
           <hr>
-          @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px;")
+          @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px; max-height: 250px;", elastic = true)
         </div>
       </div>
       <div class="pull-right">
@@ -97,7 +97,7 @@ $(function(){
     } else {
       $('#label-assigned').html($('<span>')
         .append($('<a class="username strong">').attr('href', '@path/' + userName).text(userName))
-        .append(' well be assigned'));
+        .append(' will be assigned'));
       $('a.assign[data-name=' + userName + '] i').attr('class', 'icon-ok');
     }
     $('input[name=assignedUserName]').val(userName);

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

@@ -2,11 +2,13 @@
 @import context._
 <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;" id="edit-content">@content.getOrElse("")</textarea>
+<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>
 <script>
 $(function(){
+  $('#edit-content').elastic();
+
   var callback = function(data){
     $('#issueTitle').empty().text(data.title);
     $('#issueContent').empty().html(data.content);

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){
@@ -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/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

@@ -28,6 +28,7 @@
     <script src="@assets/colorpicker/js/bootstrap-colorpicker.js"></script>
     <script src="@assets/google-code-prettify/prettify.js"></script>
     <script src="@assets/zclip/ZeroClipboard.min.js"></script>
+    <script src="@assets/elastic/jquery.elastic.source.js"></script>
   </head>
   <body>
     <form id="search" action="@path/search" method="POST">

src/main/twirl/newrepo.scala.html

@@ -5,7 +5,7 @@
 <div style="width: 600px; margin: 10px auto;">
   <form id="form" method="post" action="@path/new" validate="true">
     <fieldset>
-      <label for="name" class="strong">Repository name</label>
+      <label for="name" class="strong">Repository name:</label>
       <div class="btn-group" style="margin-bottom: 10px;" id="owner-dropdown">
         <button class="btn dropdown-toggle" data-toggle="dropdown">
           <span class="strong">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span>
@@ -19,38 +19,38 @@
         </ul>
         <input type="hidden" name="owner" id="owner" value="@loginAccount.get.userName"/>
       </div>
-      /
+      <span class="slash">/</span>
       <input type="text" name="name" id="name" />
       <span id="error-name" class="error"></span>
     </fieldset>
     <fieldset>
-      <label for="description" class="strong">Description (optional)</label>
+      <label for="description" class="strong">Description (optional):</label>
       <input type="text" name="description" id="description" style="width: 95%;"/>
     </fieldset>
     <fieldset class="margin">
-      <label>
+      <label class="radio">
         <input type="radio" name="isPrivate" value="false" checked>
-        <span class="strong">Public</span><br>
+        <span class="strong"><i class="icon-eye-open">&nbsp;</i>&nbsp;Public</span><br>
         <div>
-          <span class="note">All users and guests can read this repository.</span>
+          <span>All users and guests can read this repository.</span>
         </div>
       </label>
     </fieldset>
     <fieldset>
-      <label>
+      <label class="radio">
         <input type="radio" name="isPrivate" value="true">
-        <span class="strong">Private</span><br>
+        <span class="strong"><i class="icon-lock">&nbsp;</i>&nbsp;Private</span><br>
         <div>
-          <span class="note">Only collaborators can read this repository.</span>
+          <span>Only collaborators can read this repository.</span>
         </div>
       </label>
     </fieldset>
     <fieldset class="margin">
-      <label for="createReadme">
+      <label for="createReadme" class="checkbox">
         <input type="checkbox" name="createReadme" id="createReadme"/>
         <span class="strong">Initialize this repository with a README</span>
         <div>
-          <span class="note">This will allow you to <code>git clone</code> the repository immediately.</span>
+          <span>This will allow you to <code>git clone</code> the repository immediately.</span>
         </div>
       </label>
     </fieldset>

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

@@ -11,8 +11,8 @@
       @day.map { commit =>
         <tr>
           <td style="width: 20%;">
-            @avatar(commit.committer, 20)
-            <a href="@url(commit.committer)" class="username">@commit.committer</a>
+            @avatar(commit, 20)
+            @user(commit.committer, commit.mailAddress, "username")
           </td>
           <td>@commit.shortMessage</td>
           <td style="width: 10%; text-align: right;">

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

@@ -11,7 +11,7 @@
   hasWritePermission: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main("Pull Requests - " + repository.owner + "/" + repository.name){
+@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("pulls", repository)
   <div class="pullreq-info">
     <div id="compare-info">
@@ -27,7 +27,7 @@
       }
       @helper.html.dropdown(originId, "base") {
         @originRepository.branchList.map { branch =>
-          <li><a href="#" class="origin-branch" data-name="@branch">@helper.html.checkicon(branch == originId) @branch</a></li>
+          <li><a href="#" class="origin-branch" data-name="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
         }
       }
       ...
@@ -38,7 +38,7 @@
       }
       @helper.html.dropdown(forkedId, "compare") {
         @forkedRepository.branchList.map { branch =>
-          <li><a href="#" class="forked-branch" data-name="@branch">@helper.html.checkicon(branch == forkedId) @branch</a></li>
+          <li><a href="#" class="forked-branch" data-name="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
         }
       }
     </div>

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

@@ -10,7 +10,7 @@
   hasWritePermission: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main("Pull Requests - " + repository.owner + "/" + repository.name){
+@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("pulls", repository)
   <div class="row-fluid">
     <div class="span3">

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

@@ -9,24 +9,24 @@
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
+@html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("pulls", repository)
   @defining(dayByDayCommits.flatten){ commits =>
     <div class="pullreq-info">
       @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")
+          @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
           into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</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")
+          @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
           into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</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")
+        @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
         into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
       }
     </div>

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

@@ -9,12 +9,12 @@
   @html.header("code", repository)
   @tab(branch, repository, "files")
   <div class="head">
-    <a href="@url(repository)/tree/@branch">@repository.name</a> /
+    <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
     @pathList.zipWithIndex.map { case (section, i) =>
       @if(i == pathList.length - 1){
         @section
       } else {
-        <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
+        <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
       }
     }
   </div>
@@ -24,13 +24,13 @@
       <th style="font-weight: normal;">
         <div class="pull-left">
           @avatar(latestCommit, 20)
-          <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
+          @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
           <span class="muted">@datetime(latestCommit.time)</span>
           <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
         </div>
         <div class="btn-group pull-right">
           <a class="btn btn-mini" href="?raw=true">Raw</a>
-          <a class="btn btn-mini" href="@url(repository)/commits/@branch/@pathList.mkString("/")">History</a>
+          <a class="btn btn-mini" href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")">History</a>
         </div>  
       </th>
     </tr>

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

@@ -16,7 +16,7 @@
     @branchInfo.map { case (branchName, latestUpdateDate) =>
       <tr>
         <td>
-          <a href="@url(repository)/tree/@branchName">@branchName</a>
+          <a href="@url(repository)/tree/@encodeRefName(branchName)">@branchName</a>
           @*
           <a href="#" class="btn btn-danger btn-mini">Delete branch</a>
           *@
@@ -28,10 +28,10 @@
           @if(repository.repository.defaultBranch == branchName){
             Base branch
           } else {
-            <a href="@url(repository)/compare/@{repository.repository.defaultBranch}...@branchName">to @{repository.repository.defaultBranch}</a>
+            <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branchName)}">to @{repository.repository.defaultBranch}</a>
           }
         </td>
-        <td><a href="@url(repository)/archive/@{branchName}.zip">ZIP</a></td>
+        <td><a href="@url(repository)/archive/@{encodeRefName(branchName)}.zip">ZIP</a></td>
       </tr>
     }
   </table>

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

@@ -26,7 +26,7 @@
             <span class="muted">
               <img src="@assets/common/images/branch.png"/>
               @branches.zipWithIndex.map { case (branch, i) =>
-                <a href="@url(repository)/tree/@branch" class="branch" id="branch-@i">@branch</a>
+                <a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
               }
             </span>
           }
@@ -44,7 +44,7 @@
     <tr>
       <td>
         @avatar(commit, 20)
-        <a href="@url(commit.committer)" class="username strong">@commit.committer</a>
+        @user(commit.committer, commit.mailAddress, "username strong")
         <span class="muted">@datetime(commit.time)</span>
         <div class="pull-right monospace small" style="text-align: right;">
           <div>

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

@@ -11,16 +11,16 @@
   @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
   <div class="head">
     @if(pathList.isEmpty){
-      <a href="@url(repository)/tree/@branch">@repository.name</a> / Commit History
+      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> / Commit History
     }
     @if(pathList.nonEmpty){
       <span class="muted">History for</span>
-      <a href="@url(repository)/tree/@branch">@repository.name</a> /
+      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
       @pathList.zipWithIndex.map { case (section, i) =>
         @if(i == pathList.length - 1){
           @section
         } else {
-          <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
+          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
         }
       }
     }
@@ -49,7 +49,7 @@
                 <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
               }
               <div class="small">
-                <a href="@url(commit.committer)" class="username">@commit.committer</a>
+                @user(commit.committer, commit.mailAddress, "username")
                 <span class="muted">@datetime(commit.time)</span>
               </div>
             </div>
@@ -61,6 +61,6 @@
   }
   <div class="btn-group">
     <button class="btn" onclick="location.href='?page=@{page - 1}'"@if(page <= 1){ disabled="true"}>&lt; Newer</button>
-    <button class="btn" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Order &gt;</button>
+    <button class="btn" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Older &gt;</button>
   </div>   
-}
+}

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

@@ -12,12 +12,12 @@
   <div class="head">
     <div class="pull-right">
       @defining(repository.commitCount){ commitCount =>
-        <a href="@url(repository)/commits/@branch">@if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")</a>&nbsp;
+        <a href="@url(repository)/commits/@encodeRefName(branch)">@if(commitCount > 1000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")</a>&nbsp;
       }
     </div>
-    <a href="@url(repository)/tree/@branch">@repository.name</a> /
+    <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
     @pathList.zipWithIndex.map { case (section, i) =>
-      <a href="@url(repository)/tree/@branch/@pathList.take(i + 1).mkString("/")">@section</a> /
+      <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
     }
   </div>
   <div class="box">
@@ -35,7 +35,7 @@
         <td colspan="4" class="latest-commit">
           <div>
             @avatar(latestCommit, 20)
-            <a href="@url(latestCommit.committer)" class="username strong">@latestCommit.committer</a>
+            @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
             <span class="muted">@datetime(latestCommit.time)</span>
             <div class="pull-right align-right monospace">
               <a href="@url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
@@ -46,7 +46,7 @@
       @if(pathList.size > 0){
       <tr>
         <td width="16"></td>
-        <td><a href="@url(repository)@if(pathList.size > 1){/tree/@branch/@pathList.init.mkString("/")}">..</a></td>
+        <td><a href="@url(repository)@if(pathList.size > 1){/tree/@encodeRefName(branch)/@pathList.init.mkString("/")}">..</a></td>
         <td></td>
         <td></td>
       </tr>
@@ -62,22 +62,25 @@
         </td>
         <td>
         @if(file.isDirectory){
-          <a href="@url(repository)/tree@{(branch :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
+          <a href="@url(repository)/tree@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
         } else {
-          <a href="@url(repository)/blob@{(branch :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
+          <a href="@url(repository)/blob@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
         }
         </td>
         <td>@datetime(file.time)</td>
-        <td><a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a> [<a href="@url(file.committer)">@file.committer</a>]</td>
+        <td>
+          <a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a>
+          [@user(file.committer, file.mailAddress)]
+        </td>
       </tr>
       }
     </table>
   </div>
   
   @readme.map { content =>
-  <div class="box">
+  <div id="readme" class="box">
     <div class="box-header">README.md</div>
     <div class="box-content">@markdown(content, repository, false, false)</div>
   </div>
   }
-}
+}

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

@@ -17,7 +17,7 @@
       </span>
     } else {
       @avatar(repository.repository.originUserName.get, 20)
-      <span@if(repository.owner == repository.repository.originUserName){ class="highlight"}>
+      <span class="highlight">
         @repository.repository.originUserName / @repository.repository.originRepositoryName
       </span>
     }

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

@@ -12,13 +12,13 @@
       style  = "margin-right: 20px;"
     ){
       @repository.branchList.map { branch =>
-        <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@branch">@helper.html.checkicon(id == branch) @branch</a></li>
+        <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@encodeRefName(branch)">@helper.html.checkicon(id == branch) @branch</a></li>
       }
     }
   </li>
   }
-  <li@if(active=="files"   ){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>
-  <li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@id">Commits</a></li>
+  <li@if(active=="files"   ){ class="active"}><a href="@url(repository)/tree/@encodeRefName(id)">Files</a></li>
+  <li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@encodeRefName(id)">Commits</a></li>
   <li@if(active=="branches"){ class="active"}><a href="@url(repository)/branches">Branches@if(repository.branchList.length > 0){ <span class="badge">@repository.branchList.length</span>}</a></li>
   <li@if(active=="tags"    ){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
   <li class="pull-right">
@@ -26,4 +26,9 @@
       <input type="text" value="@repository.url" id="repository-url" readonly>
     }
   </li>
+  <li class="pull-right" style="margin-right: 8px;">
+    <div class="pull-right">
+      <a href="@{url(repository)}/archive/@{encodeRefName(id)}.zip" class="btn"><i class="icon-download-alt"></i>ZIP</a>
+    </div>
+  </li>
 </ul>

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

@@ -14,10 +14,10 @@
     </tr>
     @repository.tags.map { tag =>
       <tr>
-        <td><a href="@url(repository)/tree/@tag.name">@tag.name</a></td>
+        <td><a href="@url(repository)/tree/@encodeRefName(tag.name)">@tag.name</a></td>
         <td>@datetime(tag.time)</td>
         <td class="monospace"><a href="@url(repository)/commit/@tag.id">@tag.id.substring(0, 10)</a></td>
-        <td><a href="@url(repository)/archive/@(tag.name).zip">ZIP</a></td>
+        <td><a href="@url(repository)/archive/@{encodeRefName(tag.name)}.zip">ZIP</a></td>
       </tr>
     }
   </table>

src/main/twirl/settings/options.scala.html

@@ -10,11 +10,11 @@
         <div class="box-header">Settings</div>
         <div class="box-content">
           <fieldset>
-            <label for="description" class="strong">Description</label>
+            <label for="description" class="strong">Description:</label>
             <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
           </fieldset>
           <fieldset class="margin">
-            <label for="defaultBranch" class="strong">Default Branch</label>
+            <label for="defaultBranch" class="strong">Default Branch:</label>
             <select name="defaultBranch" id="defaultBranch">
               @repository.branchList.map { branch =>
                 <option value="@branch"@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
@@ -23,26 +23,26 @@
             <span class="error" id="error-defaultBranch"></span>
           </fieldset>
           <fieldset class="margin">
-            <label>
+            <label class="radio">
               <input type="radio" name="isPrivate" value="false"
                 @if(!repository.repository.isPrivate              ){ checked  }
                 @if(repository.repository.parentUserName.isDefined){ disabled }
               >
               <span class="strong">Public</span><br>
               <div>
-                <span class="note">All users and guests can read this repository.</span>
+                <span>All users and guests can read this repository.</span>
               </div>
             </label>
           </fieldset>
           <fieldset>
-            <label>
+            <label class="radio">
               <input type="radio" name="isPrivate" value="true"
                 @if(repository.repository.isPrivate               ){ checked  }
                 @if(repository.repository.parentUserName.isDefined){ disabled }
               >
               <span class="strong">Private</span><br>
               <div>
-                <span class="note">Only collaborators can read this repository.</span>
+                <span>Only collaborators can read this repository.</span>
               </div>
             </label>
           </fieldset>
@@ -50,7 +50,7 @@
       </div>
       @*
       <div class="box">
-        <div class="box-header">Features</div>
+        <div class="box-header">Features:</div>
         <div class="box-content">
           <dl>
             <dt>

src/main/twirl/signinform.scala.html

@@ -14,10 +14,10 @@
   <tr>
     <td>
       <form action="@path/signin" method="POST" validate="true">
-        <label for="userName">Username</label>
+        <label for="userName">Username:</label>
         <span id="error-userName" class="error"></span>
         <input type="text" name="userName" id="userName" style="width: 95%"/>
-        <label for="password">Password</label>
+        <label for="password">Password:</label>
         <span id="error-password" class="error"></span>
         <input type="password" name="password" id="password" style="width: 95%"/>
         <div>

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

@@ -1,10 +1,15 @@
 @(pageName: Option[String],
+  from: String,
+  to: String,
   diffs: Seq[util.JGitUtil.DiffInfo],
-  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+  repository: service.RepositoryService.RepositoryInfo,
+  hasWritePermission: Boolean,
+  info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
+  @helper.html.information(info)
   @html.header("wiki", repository)
   @tab("history", repository)
   <ul class="nav nav-tabs">
@@ -23,4 +28,13 @@
     </li>
   </ul>
   @helper.html.diff(diffs, repository, None, None, false)
+  @if(hasWritePermission){
+    <div>
+      @if(pageName.isDefined){
+        <a href="@url(repository)/wiki/@urlEncode(pageName)/_revert/@from...@to" class="btn">Revert Changes</a>
+      } else {
+        <a href="@url(repository)/wiki/_revert/@from...@to" class="btn">Revert Changes</a>
+      }
+    </div>
+  }
 }

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

@@ -3,16 +3,16 @@
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@html.main(s"${if(pageName == "") "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
+@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
   @html.header("wiki", repository)
   @tab("", repository)
   <ul class="nav nav-tabs">
     <li>
-      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName == ""){New Page} else {@pageName}</h1>
+      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
     </li>
     <li class="pull-right">
       <div class="btn-group">
-      @if(pageName != ""){
+      @if(page.isDefined){
         <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
         <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
         <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
@@ -20,12 +20,13 @@
       </div>
     </li>
   </ul>
-  <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
+  <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
     <span id="error-pageName" class="error"></span>
     <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
     @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 900px; height: 400px;", "")
     <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
     <input type="hidden" name="currentPageName" value="@pageName"/>
+    <input type="hidden" name="id" value="@page.map(_.id)"/>
     <input type="submit" value="Save" class="btn btn-success">
   </form>
 }

src/main/twirl/wiki/history.scala.html

@@ -35,10 +35,9 @@
     @commits.map { commit =>
       <tr>
         <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
-        <td>@avatar(commit.committer, 20)<a href="@url(commit.committer)">@commit.committer</a></td>
+        <td>@avatar(commit, 20)&nbsp;@user(commit.committer, commit.mailAddress)</td>
         <td width="80%">
-          <span class="muted">@datetime(commit.time):</span>
-          @commit.shortMessage
+          <span class="muted">@datetime(commit.time):</span>&nbsp;@commit.shortMessage
         </td>
       </tr>
     }

src/main/webapp/WEB-INF/web.xml

@@ -27,34 +27,14 @@
     <servlet-name>GitRepositoryServlet</servlet-name>
     <url-pattern>/git/*</url-pattern>
   </servlet-mapping>
-  
-  <filter>
-    <filter-name>TransactionFilter</filter-name>
-    <filter-class>servlet.TransactionFilter</filter-class>
-  </filter>
-  
-  <filter-mapping>
-    <filter-name>TransactionFilter</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  
-  <filter>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    <filter-class>servlet.BasicAuthenticationFilter</filter-class>
-  </filter>
-  
-  <filter-mapping>
-    <filter-name>BasicAuthenticationFilter</filter-name>
-    <url-pattern>/git/*</url-pattern>
-  </filter-mapping>
-  
+
   <!-- ===================================================================== -->
   <!-- H2 database configuration -->
   <!-- ===================================================================== -->
   <listener>
     <listener-class>servlet.AutoUpdateListener</listener-class>
   </listener>
-  
+
   <context-param>
     <param-name>db.user</param-name>
     <param-value>sa</param-value>
@@ -101,4 +81,14 @@
     <session-timeout>1440</session-timeout>
   </session-config>
 
+  <!-- ===================================================================== -->
+  <!-- Optional configurations -->
+  <!-- ===================================================================== -->
+  <!--
+  <context-param>
+    <param-name>gitbucket.home</param-name>
+    <param-value>PATH_TO_DATADIR</param-value>
+  </context-param>
+  -->
+
 </web-app>

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

@@ -5,6 +5,10 @@ body {
   color: #333;
 }
 
+li p {
+  margin: 0px;
+}
+
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
@@ -256,10 +260,6 @@ hr {
   margin-bottom: 4px;
 }
 
-span.note {
-  margin-left: 20px;
-}
-
 img.avatar {
   border-radius: 4px;
   -webkit-border-radius: 4px;
@@ -302,6 +302,13 @@ span.highlight {
   background-color: #ffff88;
 }
 
+/****************************************************************************/
+/* Create Repository */
+/****************************************************************************/
+.slash {
+  font-size: 20px;
+}
+
 /****************************************************************************/
 /* Sign-in form */
 /****************************************************************************/
@@ -310,6 +317,20 @@ div.signin-form {
   margin: 30px auto;
 }
 
+/****************************************************************************/
+/* Account page */
+/****************************************************************************/
+.account-fullname {
+  font-size: 140%;
+  font-weight: bold;
+}
+
+.account-username {
+  font-size: 120%;
+  color: #888888;
+  font-weight: bold;
+}
+
 /****************************************************************************/
 /* Stacked side menu */
 /****************************************************************************/
@@ -426,7 +447,7 @@ pre.commit-description {
 #repository-url {
   background-color: white;
   cursor: default;
-  width: 350px;
+  width: 300px;
 }
 
 ul#commit-file-list {
@@ -455,6 +476,10 @@ pre.blob {
   padding-left: 20px;
 }
 
+#readme .box-content {
+  padding: 30px;
+}
+
 /****************************************************************************/
 /* Issues */
 /****************************************************************************/
@@ -649,6 +674,10 @@ h1.wiki-title {
   margin-top: 0px;
 }
 
+a.absent {
+  color: #c00;
+}
+
 /****************************************************************************/
 /* Repository Settings */
 /****************************************************************************/
@@ -808,4 +837,4 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child {
   -webkit-border-top-right-radius: 4px;
           border-top-right-radius: 4px;
   -moz-border-radius-topright: 4px;
-}
+}

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

@@ -1,39 +0,0 @@
-$(function(){
-  $.each($('form[validate=true]'), function(i, form){
-    $(form).submit(validate);
-  });
-  $.each($('input[formaction]'), function(i, input){
-    $(input).click(function(){
-      var form = $(input).parents('form')
-      $(form).attr('action', $(input).attr('formaction'))
-    });
-  });
-});
-
-function validate(e){
-  var form = $(e.target);
-  
-  if(form.data('validated') == true){
-    return true;
-  }
-
-  $.post(form.attr('action') + '/validate', $(e.target).serialize(), function(data){
-    // clear all error messages
-    $('.error').text('');
-    
-    if($.isEmptyObject(data)){
-      form.data('validated', true);
-      form.submit();
-    } else {
-      form.data('validated', false);
-      displayErrors(data);
-    }
-  }, 'json');
-  return false;
-}
-
-function displayErrors(data){
-  $.each(data, function(key, value){
-    $('#error-' + key.split('.').join('_')).text(value);
-  });
-}

src/main/webapp/assets/elastic/jquery.elastic.source.js

@@ -0,0 +1,162 @@
+/**
+*	@name							Elastic
+*	@descripton						Elastic is jQuery plugin that grow and shrink your textareas automatically
+*	@version						1.6.11
+*	@requires						jQuery 1.2.6+
+*
+*	@author							Jan Jarfalk
+*	@author-email					jan.jarfalk@unwrongest.com
+*	@author-website					http://www.unwrongest.com
+*
+*	@licence						MIT License - http://www.opensource.org/licenses/mit-license.php
+*/
+
+(function($){ 
+	jQuery.fn.extend({  
+		elastic: function() {
+		
+			//	We will create a div clone of the textarea
+			//	by copying these attributes from the textarea to the div.
+			var mimics = [
+				'paddingTop',
+				'paddingRight',
+				'paddingBottom',
+				'paddingLeft',
+				'fontSize',
+				'lineHeight',
+				'fontFamily',
+				'width',
+				'fontWeight',
+				'border-top-width',
+				'border-right-width',
+				'border-bottom-width',
+				'border-left-width',
+				'borderTopStyle',
+				'borderTopColor',
+				'borderRightStyle',
+				'borderRightColor',
+				'borderBottomStyle',
+				'borderBottomColor',
+				'borderLeftStyle',
+				'borderLeftColor'
+				];
+			
+			return this.each( function() {
+
+				// Elastic only works on textareas
+				if ( this.type !== 'textarea' ) {
+					return false;
+				}
+					
+			var $textarea	= jQuery(this),
+				$twin		= jQuery('<div />').css({
+					'position'		: 'absolute',
+					'display'		: 'none',
+					'word-wrap'		: 'break-word',
+					'white-space'	:'pre-wrap'
+				}),
+				lineHeight	= parseInt($textarea.css('line-height'),10) || parseInt($textarea.css('font-size'),'10'),
+				minheight	= parseInt($textarea.css('height'),10) || lineHeight*3,
+				maxheight	= parseInt($textarea.css('max-height'),10) || Number.MAX_VALUE,
+				goalheight	= 0;
+				
+				// Opera returns max-height of -1 if not set
+				if (maxheight < 0) { maxheight = Number.MAX_VALUE; }
+					
+				// Append the twin to the DOM
+				// We are going to meassure the height of this, not the textarea.
+				$twin.appendTo($textarea.parent());
+				
+				// Copy the essential styles (mimics) from the textarea to the twin
+				var i = mimics.length;
+				while(i--){
+					$twin.css(mimics[i].toString(),$textarea.css(mimics[i].toString()));
+				}
+				
+				// Updates the width of the twin. (solution for textareas with widths in percent)
+				function setTwinWidth(){
+					var curatedWidth = Math.floor(parseInt($textarea.width(),10));
+					if($twin.width() !== curatedWidth){
+						$twin.css({'width': curatedWidth + 'px'});
+						
+						// Update height of textarea
+						update(true);
+					}
+				}
+				
+				// Sets a given height and overflow state on the textarea
+				function setHeightAndOverflow(height, overflow){
+				
+					var curratedHeight = Math.floor(parseInt(height,10));
+					if($textarea.height() !== curratedHeight){
+						$textarea.css({'height': curratedHeight + 'px','overflow':overflow});
+					}
+				}
+				
+				// This function will update the height of the textarea if necessary 
+				function update(forced) {
+					
+					// Get curated content from the textarea.
+					var textareaContent = $textarea.val().replace(/&/g,'&amp;').replace(/ {2}/g, '&nbsp;').replace(/<|>/g, '&gt;').replace(/\n/g, '<br />');
+					
+					// Compare curated content with curated twin.
+					var twinContent = $twin.html().replace(/<br>/ig,'<br />');
+					
+					if(forced || textareaContent+'&nbsp;' !== twinContent){
+					
+						// Add an extra white space so new rows are added when you are at the end of a row.
+						$twin.html(textareaContent+'&nbsp;');
+						
+						// Change textarea height if twin plus the height of one line differs more than 3 pixel from textarea height
+						if(Math.abs($twin.height() + lineHeight - $textarea.height()) > 3){
+							
+							var goalheight = $twin.height()+lineHeight;
+							if(goalheight >= maxheight) {
+								setHeightAndOverflow(maxheight,'auto');
+							} else if(goalheight <= minheight) {
+								setHeightAndOverflow(minheight,'hidden');
+							} else {
+								setHeightAndOverflow(goalheight,'hidden');
+							}
+							
+						}
+						
+					}
+					
+				}
+				
+				// Hide scrollbars
+				$textarea.css({'overflow':'hidden'});
+				
+				// Update textarea size on keyup, change, cut and paste
+				$textarea.bind('keyup change cut paste', function(){
+					update(); 
+				});
+				
+				// Update width of twin if browser or textarea is resized (solution for textareas with widths in percent)
+				$(window).bind('resize', setTwinWidth);
+				$textarea.bind('resize', setTwinWidth);
+				$textarea.bind('update', update);
+				
+				// Compact textarea on blur
+				$textarea.bind('blur',function(){
+					if($twin.height() < maxheight){
+						if($twin.height() > minheight) {
+							$textarea.height($twin.height());
+						} else {
+							$textarea.height(minheight);
+						}
+					}
+				});
+				
+				// And this line is to catch the browser paste event
+				$textarea.bind('input paste',function(e){ setTimeout( update, 250); });				
+				
+				// Run update once when elastic is initialized
+				update();
+				
+			});
+			
+        } 
+    }); 
+})(jQuery);

src/test/scala/service/AccountServiceServiceSpec.scala

@@ -0,0 +1,78 @@
+package service
+
+import org.specs2.mutable.Specification
+import java.util.Date
+
+class AccountServiceServiceSpec extends Specification with ServiceSpecBase {
+
+  "AccountService" should {
+    val RootMailAddress = "root@localhost"
+
+    "getAllUsers" in { withTestDB{
+      AccountService.getAllUsers() must be like{
+        case List(model.Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok
+      }
+    }}
+
+    "getAccountByUserName" in { withTestDB{
+      AccountService.getAccountByUserName("root") must beSome.like{
+        case user => user.userName must_== "root"
+      }
+
+      AccountService.getAccountByUserName("invalid user name") must beNone
+    }}
+
+    "getAccountByMailAddress" in { withTestDB{
+      AccountService.getAccountByMailAddress(RootMailAddress) must beSome
+    }}
+
+    "updateLastLoginDate" in { withTestDB{
+      val root = "root"
+      def user() =
+        AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
+
+      user().lastLoginDate must beNone
+      val date1 = new Date
+      AccountService.updateLastLoginDate(root)
+      user().lastLoginDate must beSome.like{ case date =>
+        date must be_>(date1)
+      }
+      val date2 = new Date
+      Thread.sleep(1000)
+      AccountService.updateLastLoginDate(root)
+      user().lastLoginDate must beSome.like{ case date =>
+        date must be_>(date2)
+      }
+    }}
+
+    "updateAccount" in { withTestDB{
+      val root = "root"
+      def user() =
+        AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
+
+      val newAddress = "new mail address"
+      AccountService.updateAccount(user().copy(mailAddress = newAddress))
+      user().mailAddress must_== newAddress
+    }}
+
+    "group" in { withTestDB {
+      val group1 = "group1"
+      val user1 = "root"
+      AccountService.createGroup(group1, None)
+
+      AccountService.getGroupMembers(group1) must_== Nil
+      AccountService.getGroupsByUserName(user1) must_== Nil
+
+      AccountService.updateGroupMembers(group1, List(user1))
+
+      AccountService.getGroupMembers(group1) must_== List(user1)
+      AccountService.getGroupsByUserName(user1) must_== List(group1)
+
+      AccountService.updateGroupMembers(group1, Nil)
+
+      AccountService.getGroupMembers(group1) must_== Nil
+      AccountService.getGroupsByUserName(user1) must_== Nil
+    }}
+  }
+}
+

src/test/scala/service/ServiceSpecBase.scala

@@ -0,0 +1,25 @@
+package service
+
+import scala.slick.session.Database
+import util.ControlUtil._
+import java.sql.DriverManager
+import org.apache.commons.io.FileUtils
+import scala.util.Random
+import java.io.File
+
+trait ServiceSpecBase {
+
+  def withTestDB[A](action: => A): A = {
+    util.FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
+      val (url, user, pass) = (s"jdbc:h2:${dir}", "sa", "sa")
+      org.h2.Driver.load()
+      using(DriverManager.getConnection(url, user, pass)){ conn =>
+        servlet.AutoUpdate.versions.reverse.foreach(_.update(conn))
+      }
+      Database.forURL(url, user, pass).withSession {
+        action
+      }
+    }
+  }
+
+}

src/test/scala/util/StringUtilSpec.scala

@@ -0,0 +1,38 @@
+package util
+
+import org.specs2.mutable._
+
+class StringUtilSpec extends Specification {
+
+  "urlDecode" should {
+    "decode encoded string to original string" in {
+      val encoded = StringUtil.urlEncode("あいうえお")
+      StringUtil.urlDecode(encoded) mustEqual "あいうえお"
+    }
+  }
+
+  "splitWords" should {
+    "split string by whitespaces" in {
+      val split = StringUtil.splitWords("aa bb\tcc　dd \t　ee")
+      split mustEqual Array("aa", "bb", "cc", "dd", "ee")
+    }
+  }
+
+  "escapeHtml" should {
+    "escape &, <, > and \"" in {
+      StringUtil.escapeHtml("<a href=\"/test\">a & b</a>") mustEqual "&lt;a href=&quot;/test&quot;&gt;a &amp; b&lt;/a&gt;"
+    }
+  }
+
+  "md5" should {
+    "generate MD5 hash" in {
+      StringUtil.md5("abc") mustEqual "900150983cd24fb0d6963f7d28e17f72"
+    }
+  }
+
+  "sha1" should {
+    "generate SHA1 hash" in {
+      StringUtil.sha1("abc") mustEqual "a9993e364706816aba3e25717850c26c9cd0d89d"
+    }
+  }
+}

src/test/scala/util/ValidationsSpec.scala

@@ -0,0 +1,36 @@
+package util
+
+import org.specs2.mutable._
+import org.scalatra.i18n.Messages
+
+class ValidationsSpec extends Specification with Validations {
+
+  "identifier" should {
+    "validate id string " in {
+      identifier.validate("id", "aa_ZZ-00.01", null) mustEqual None
+      identifier.validate("id", "_aaaa", null) mustEqual Some("id starts with invalid character.")
+      identifier.validate("id", "-aaaa", null) mustEqual Some("id starts with invalid character.")
+      identifier.validate("id", "aa_ZZ#01", null) mustEqual Some("id contains invalid character.")
+    }
+  }
+
+  "color" should {
+    "validate color string " in {
+      val messages = Messages()
+      color.validate("color", "#88aaff", messages) mustEqual None
+      color.validate("color", "#gghhii", messages) mustEqual Some("color must be '#[0-9a-fA-F]{6}'.")
+    }
+  }
+
+  "date" should {
+//    "validate date string " in {
+//      date().validate("date", "2013-10-05", Map[String, String]()) mustEqual Nil
+//      date().validate("date", "2013-10-5" , Map[String, String]()) mustEqual List(("date", "date must be '\\d{4}-\\d{2}-\\d{2}'."))
+//    }
+    "convert date string " in {
+      val result = date().convert("2013-10-05", null)
+      new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(result) mustEqual "2013-10-05 00:00:00"
+    }
+  }
+
+}