Update README.md

Allow to force HTTPS scheme

README.md

@@ -6,7 +6,7 @@ GitBucket is the easily installable Github clone written with Scala.
 The current version of GitBucket provides a basic features below:
 
 - Public / Private Git repository (http access only)
-- Repository viewer (some advanced features are not implemented)
+- Repository viewer (some advanced features such as online file editing are not implemented)
 - Repository search (Code and Issues)
 - Wiki
 - Issues
@@ -15,9 +15,13 @@ The current version of GitBucket provides a basic features below:
 - Activity timeline
 - User management (for Administrators)
 - Group (like Organization in Github)
+- LDAP integration
+- Gravatar support
 
 Following features are not implemented, but we will make them in the future release!
 
+- File editing in repository viewer
+- Comment for the changeset
 - Network graph
 - Statics
 - Watch / Star
@@ -28,55 +32,85 @@ 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**.
 
-To upgrade GitBucket, only replace gitbucket.war.
+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]
+
+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.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

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<project name="gitbucket" default="all" basedir=".">
+
+  <property name="target.dir" value="target"/>
+  <property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
+  <property name="jetty.dir" value="embed-jetty"/>
+  <property name="scala.version" value="2.10"/>
+  <property name="gitbucket.version" value="0.0.1"/>
+  <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 executable="${sbt.exec}" resolveexecutable="true" failonerror="true">
+      <arg line="clean compile test package" />
+    </exec>
+  </target>
+
+  <target name="embed" depends="war">
+    <mkdir dir="${embed.classes.dir}"/>
+
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/javax.servlet-${servlet.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-continuation-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-http-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-io-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-security-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-server-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-servlet-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-util-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-webapp-${jetty.version}.jar" />
+    <unzip dest="${embed.classes.dir}" src="${jetty.dir}/jetty-xml-${jetty.version}.jar" />
+
+    <zip destfile="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+         basedir="${embed.classes.dir}"
+         update = "true"
+         includes="javax/**,org/**"/>
+
+    <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,HttpsSupportConnector.class"/>
+  </target>
+
+  <target name="rename" depends="embed">
+    <rename src="${target.dir}/scala-${scala.version}/gitbucket_${scala.version}-${gitbucket.version}.war"
+            dest="${target.dir}/scala-${scala.version}/gitbucket.war"/>
+  </target>
+
+  <target name="all" depends="rename">
+  </target>
+
+
+</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,44 @@
+Name:		gitbucket
+Summary:	Github clone written with Scala.
+Version:	1.6
+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
+* 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,25 +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",
+        "org.json4s" %% "json4s-jackson" % "3.2.5",
         "jp.sf.amateras" %% "scalatra-forms" % "0.0.2",
         "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.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",
-        "org.eclipse.jetty" % "jetty-webapp" % "8.1.8.v20121106" % "container",
-        "org.eclipse.jetty.orbit" % "javax.servlet" % "3.0.0.v201112011016" % "container;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar"))
+        "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")),
+        "junit" % "junit" % "4.11" % "test"
       ),
-      EclipseKeys.withSource := true
+      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")

src/main/java/JettyLauncher.java

@@ -0,0 +1,75 @@
+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("=")) {
+                String[] dim = arg.split("=");
+                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")) {
+                        contextPath = dim[1];
+                    } else if(dim[0].equals("--https") && (dim[1].equals("1") || dim[1].equals("true"))) {
+                        forceHttps = true;
+                    }
+                }
+            }
+        }
+
+        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);
+        context.setDescriptor(location.toExternalForm() + "/WEB-INF/web.xml");
+        context.setServer(server);
+        context.setWar(location.toExternalForm());
+
+        server.setHandler(context);
+        server.start();
+        server.join();
+    }
+}
+
+class HttpsSupportConnector extends SelectChannelConnector {
+    private boolean forceHttps;
+
+    public HttpsSupportConnector(boolean forceHttps) {
+        this.forceHttps = forceHttps;
+    }
+
+    @Override
+    public void customize(final EndPoint endpoint, final Request request) throws IOException {
+        if (this.forceHttps) {
+            request.setScheme("https");
+            super.customize(endpoint, request);
+        }
+    }
+}

src/main/resources/logback.xml

@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-  <logger name="scala.slick" level="INFO" />
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="STDOUT" />
+  </root>
+  
+  <!--
+  <logger name="service.WebHookService" level="DEBUG" />
+  <logger name="servlet" level="DEBUG" />
+  -->
 </configuration>

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

@@ -0,0 +1,8 @@
+CREATE TABLE WEB_HOOK (
+		USER_NAME VARCHAR(100) NOT NULL,
+		REPOSITORY_NAME VARCHAR(100) NOT NULL,
+		URL VARCHAR(200) NOT NULL
+);
+
+ALTER TABLE WEB_HOOK ADD CONSTRAINT IDX_WEB_HOOK_PK PRIMARY KEY (USER_NAME, REPOSITORY_NAME, URL);
+ALTER TABLE WEB_HOOK ADD CONSTRAINT IDX_WEB_HOOK_FK0 FOREIGN KEY (USER_NAME, REPOSITORY_NAME) REFERENCES REPOSITORY (USER_NAME, REPOSITORY_NAME);

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

@@ -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/scala/app/AccountController.scala

@@ -15,15 +15,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 +32,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 +86,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))
 
@@ -106,7 +109,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

@@ -1,7 +1,9 @@
 package app
 
 import _root_.util.Directory._
-import _root_.util.{FileUtil, Validations}
+import _root_.util.Implicits._
+import _root_.util.ControlUtil._
+import _root_.util.{FileUtil, Validations, Keys}
 import org.scalatra._
 import org.scalatra.json._
 import org.json4s._
@@ -32,7 +34,7 @@ abstract class ControllerBase extends ScalatraFilter
     val path         = httpRequest.getRequestURI.substring(context.length)
 
     if(path.startsWith("/console/")){
-      val account = httpRequest.getSession.getAttribute("LOGIN_ACCOUNT").asInstanceOf[Account]
+      val account = httpRequest.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
       if(account == null){
         // Redirect to login form
         httpResponse.sendRedirect(context + "/signin?" + path)
@@ -57,56 +59,47 @@ abstract class ControllerBase extends ScalatraFilter
    */
   implicit def context: Context = Context(servletContext.getContextPath, LoginAccount, currentURL, request)
 
-  private def currentURL: String = {
-    val queryString = request.getQueryString
+  private def currentURL: String = defining(request.getQueryString){ queryString =>
     request.getRequestURI + (if(queryString != null) "?" + queryString else "")
   }
 
-  private def LoginAccount: Option[Account] = {
-    session.get("LOGIN_ACCOUNT") match {
-      case Some(x: Account) => Some(x)
-      case _ => None
-    }
-  }
+  private def LoginAccount: Option[Account] = session.getAs[Account](Keys.Session.LoginAccount)
 
-  def ajaxGet(path : String)(action : => Any) : Route = {
+  def ajaxGet(path : String)(action : => Any) : Route =
     super.get(path){
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
-  }
 
-  override def ajaxGet[T](path : String, form : MappingValueType[T])(action : T => Any) : Route = {
+  override def ajaxGet[T](path : String, form : MappingValueType[T])(action : T => Any) : Route =
     super.ajaxGet(path, form){ form =>
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
-  }
 
-  def ajaxPost(path : String)(action : => Any) : Route = {
+  def ajaxPost(path : String)(action : => Any) : Route =
     super.post(path){
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action
     }
-  }
 
-  override def ajaxPost[T](path : String, form : MappingValueType[T])(action : T => Any) : Route = {
+  override def ajaxPost[T](path : String, form : MappingValueType[T])(action : T => Any) : Route =
     super.ajaxPost(path, form){ form =>
-      request.setAttribute("AJAX", "true")
+      request.setAttribute(Keys.Request.Ajax, "true")
       action(form)
     }
-  }
 
-  protected def NotFound() = {
-    if(request.getAttribute("AJAX") == null){
-      org.scalatra.NotFound(html.error("Not Found"))
-    } else {
+  protected def NotFound() =
+    if(request.hasAttribute(Keys.Request.Ajax)){
       org.scalatra.NotFound()
+    } else {
+      org.scalatra.NotFound(html.error("Not Found"))
     }
-  }
 
-  protected def Unauthorized()(implicit context: app.Context) = {
-    if(request.getAttribute("AJAX") == null){
+  protected def Unauthorized()(implicit context: app.Context) =
+    if(request.hasAttribute(Keys.Request.Ajax)){
+      org.scalatra.Unauthorized()
+    } else {
       if(context.loginAccount.isDefined){
         org.scalatra.Unauthorized(redirect("/"))
       } else {
@@ -116,13 +109,9 @@ abstract class ControllerBase extends ScalatraFilter
           org.scalatra.Unauthorized(redirect("/signin?redirect=" + currentURL))
         }
       }
-    } else {
-      org.scalatra.Unauthorized()
     }
-  }
 
-  protected def baseUrl = {
-    val url = request.getRequestURL.toString
+  protected def baseUrl = defining(request.getRequestURL.toString){ url =>
     url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
   }
 
@@ -133,12 +122,10 @@ abstract class ControllerBase extends ScalatraFilter
  */
 case class Context(path: String, loginAccount: Option[Account], currentUrl: String, request: HttpServletRequest){
 
-  def redirectUrl = {
-    if(request.getParameter("redirect") != null){
-      request.getParameter("redirect")
-    } else {
-      currentUrl
-    }
+  def redirectUrl = if(request.getParameter("redirect") != null){
+    request.getParameter("redirect")
+  } else {
+    currentUrl
   }
 
   /**
@@ -147,13 +134,14 @@ case class Context(path: String, loginAccount: Option[Account], currentUrl: Stri
    * If object has not been cached with the specified key then retrieves by given action.
    * Cached object are available during a request.
    */
-  def cache[A](key: String)(action: => A): A = {
-    Option(request.getAttribute("cache." + key).asInstanceOf[A]).getOrElse {
-      val newObject = action
-      request.setAttribute("cache." + key, newObject)
-      newObject
+  def cache[A](key: String)(action: => A): A =
+    defining(Keys.Request.Cache(key)){ cacheKey =>
+      Option(request.getAttribute(cacheKey).asInstanceOf[A]).getOrElse {
+        val newObject = action
+        request.setAttribute(cacheKey, newObject)
+        newObject
+      }
     }
-  }
 
 }
 
@@ -163,7 +151,7 @@ case class Context(path: String, loginAccount: Option[Account], currentUrl: Stri
 trait AccountManagementControllerBase extends ControllerBase with FileUploadControllerBase {
   self: AccountService  =>
 
-  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit = {
+  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
     if(clearImage){
       getAccountByUserName(userName).flatMap(_.image).map { image =>
         new java.io.File(getUserUploadDir(userName), image).delete()
@@ -179,7 +167,6 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
         updateAvatarImage(userName, Some(filename))
       }
     }
-  }
 
   protected def uniqueUserName: Constraint = new Constraint(){
     override def validate(name: String, value: String): Option[String] =
@@ -215,12 +202,7 @@ trait FileUploadControllerBase {
   def removeTemporaryFiles()(implicit session: HttpSession): Unit =
     FileUtils.deleteDirectory(TemporaryDir)
 
-  def getUploadedFilename(fileId: String)(implicit session: HttpSession): Option[String] = {
-    val filename = Option(session.getAttribute("upload_" + fileId).asInstanceOf[String])
-    if(filename.isDefined){
-      session.removeAttribute("upload_" + fileId)
-    }
-    filename
-  }
+  def getUploadedFilename(fileId: String)(implicit session: HttpSession): Option[String] =
+    session.getAndRemove[String](Keys.Session.Upload(fileId))
 
 }

src/main/scala/app/CreateRepositoryController.scala

@@ -1,6 +1,7 @@
 package app
 
 import util.Directory._
+import util.ControlUtil._
 import util._
 import service._
 import java.io.File
@@ -8,7 +9,6 @@ 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
 
 class CreateRepositoryController extends CreateRepositoryControllerBase
   with RepositoryService with AccountService with WikiService with LabelsService with ActivityService
@@ -73,8 +73,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
         JGitUtil.initRepository(gitdir)
 
         if(form.createReadme){
-          val tmpdir = getInitRepositoryDir(form.owner, form.name)
-          try {
+          FileUtil.withTmpDir(getInitRepositoryDir(form.owner, form.name)){ tmpdir =>
             // Clone the repository
             Git.cloneRepository.setURI(gitdir.toURI.toString).setDirectory(tmpdir).call
 
@@ -93,12 +92,9 @@ trait CreateRepositoryControllerBase extends ControllerBase {
             val git = Git.open(tmpdir)
             git.add.addFilepattern("README.md").call
             git.commit
-              .setCommitter(new PersonIdent(loginUserName, loginAccount.mailAddress))
+              .setCommitter(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
               .setMessage("Initial commit").call
             git.push.call
-
-          } finally {
-            FileUtils.deleteDirectory(tmpdir)
           }
         }
 
@@ -149,7 +145,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
           getWikiRepositoryDir(loginUserName, repository.name))
 
         // insert commit id
-        JGitUtil.withGit(getRepositoryDir(loginUserName, repository.name)){ git =>
+        using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
           JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
             JGitUtil.getCommitLog(git, branch) match {
               case Right((commits, _)) => commits.foreach { commit =>

src/main/scala/app/DashboardController.scala

@@ -1,7 +1,8 @@
 package app
 
 import service._
-import util.UsersAuthenticator
+import util.{UsersAuthenticator, Keys}
+import util.Implicits._
 
 class DashboardController extends DashboardControllerBase
   with IssuesService with PullRequestService with RepositoryService with AccountService
@@ -42,12 +43,10 @@ trait DashboardControllerBase extends ControllerBase {
     import IssuesService._
 
     // condition
-    val sessionKey = "dashboard/issues"
-    val condition = if(request.getQueryString == null)
-      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
-    else IssueSearchCondition(request)
-
-    session.put(sessionKey, condition)
+    val condition = session.putAndGet(Keys.Session.DashboardIssues,
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardIssues).getOrElse(IssueSearchCondition())
+    )
 
     val userName = context.loginAccount.get.userName
     val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
@@ -75,15 +74,10 @@ trait DashboardControllerBase extends ControllerBase {
     import PullRequestService._
 
     // condition
-    val sessionKey = "dashboard/pulls"
-    val condition = {
-      if(request.getQueryString == null)
-        session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
-      else
-        IssueSearchCondition(request)
-    }.copy(repo = repository)
-
-    session.put(sessionKey, condition)
+    val condition = session.putAndGet(Keys.Session.DashboardPulls, {
+      if(request.hasQueryString) IssueSearchCondition(request)
+      else session.getAs[IssueSearchCondition](Keys.Session.DashboardPulls).getOrElse(IssueSearchCondition())
+    }.copy(repo = repository))
 
     val userName = context.loginAccount.get.userName
     val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
@@ -93,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/FileUploadController.scala

@@ -1,6 +1,7 @@
 package app
 
-import util.{FileUtil}
+import _root_.util.{Keys, FileUtil}
+import util.ControlUtil._
 import org.scalatra._
 import org.scalatra.servlet.{MultipartConfig, FileUploadSupport}
 import org.apache.commons.io.FileUtils
@@ -18,10 +19,9 @@ class FileUploadController extends ScalatraServlet
 
   post("/image"){
     fileParams.get("file") match {
-      case Some(file) if(FileUtil.isImage(file.name)) => {
-        val fileId  = generateFileId
+      case Some(file) if(FileUtil.isImage(file.name)) => defining(generateFileId){ fileId =>
         FileUtils.writeByteArrayToFile(getTemporaryFile(fileId), file.get)
-        session += "upload_" + fileId -> file.name
+        session += Keys.Session.Upload(fileId) -> file.name
         Ok(fileId)
       }
       case None => BadRequest

src/main/scala/app/IssuesController.scala

@@ -4,7 +4,9 @@ import jp.sf.amateras.scalatra.forms._
 
 import service._
 import IssuesService._
-import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, ReadableUsersAuthenticator, Notifier}
+import util.{CollaboratorsAuthenticator, ReferrerAuthenticator, ReadableUsersAuthenticator, Notifier, Keys}
+import util.Implicits._
+import util.ControlUtil._
 import org.scalatra.Ok
 
 class IssuesController extends IssuesControllerBase
@@ -12,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],
@@ -57,79 +59,75 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/issues/:id")(referrersOnly { repository =>
-    val owner   = repository.owner
-    val name    = repository.name
-    val issueId = params("id")
-
-    getIssue(owner, name, issueId) map {
-      issues.html.issue(
+    defining(repository.owner, repository.name, params("id")){ case (owner, name, issueId) =>
+      getIssue(owner, name, issueId) map {
+        issues.html.issue(
           _,
           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),
           repository)
-    } getOrElse NotFound
+      } getOrElse NotFound
+    }
   })
 
   get("/:owner/:repository/issues/new")(readableUsersOnly { repository =>
-    val owner = repository.owner
-    val name  = repository.name
-
-    issues.html.create(
-        (getCollaborators(owner, name) :+ owner).sorted,
-        getMilestones(owner, name),
-        getLabels(owner, name),
-        hasWritePermission(owner, name, context.loginAccount),
-        repository)
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      issues.html.create(
+        (getCollaborators(owner, name) ::: (if(getAccountByUserName(owner).get.isGroupAccount) Nil else List(owner))).sorted,
+          getMilestones(owner, name),
+          getLabels(owner, name),
+          hasWritePermission(owner, name, context.loginAccount),
+          repository)
+    }
   })
 
   post("/:owner/:repository/issues/new", issueCreateForm)(readableUsersOnly { (form, repository) =>
-    val owner    = repository.owner
-    val name     = repository.name
-    val writable = hasWritePermission(owner, name, context.loginAccount)
-    val userName = context.loginAccount.get.userName
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      val writable = hasWritePermission(owner, name, context.loginAccount)
+      val userName = context.loginAccount.get.userName
 
-    // insert issue
-    val issueId = createIssue(owner, name, userName, form.title, form.content,
-      if(writable) form.assignedUserName else None,
-      if(writable) form.milestoneId else None)
+      // insert issue
+      val issueId = createIssue(owner, name, userName, form.title, form.content,
+        if(writable) form.assignedUserName else None,
+        if(writable) form.milestoneId else None)
 
-    // insert labels
-    if(writable){
-      form.labelNames.map { value =>
-        val labels = getLabels(owner, name)
-        value.split(",").foreach { labelName =>
-          labels.find(_.labelName == labelName).map { label =>
-            registerIssueLabel(owner, name, issueId, label.labelId)
+      // insert labels
+      if(writable){
+        form.labelNames.map { value =>
+          val labels = getLabels(owner, name)
+          value.split(",").foreach { labelName =>
+            labels.find(_.labelName == labelName).map { label =>
+              registerIssueLabel(owner, name, issueId, label.labelId)
+            }
           }
         }
       }
+
+      // record activity
+      recordCreateIssueActivity(owner, name, userName, issueId, form.title)
+
+      // notifications
+      Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
+        Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+      }
+
+      redirect(s"/${owner}/${name}/issues/${issueId}")
     }
-
-    // record activity
-    recordCreateIssueActivity(owner, name, userName, issueId, form.title)
-
-    // notifications
-    Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
-      Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
-    }
-
-    redirect(s"/${owner}/${name}/issues/${issueId}")
   })
 
   ajaxPost("/:owner/:repository/issues/edit/:id", issueEditForm)(readableUsersOnly { (form, repository) =>
-    val owner = repository.owner
-    val name  = repository.name
-
-    getIssue(owner, name, params("id")).map { issue =>
-      if(isEditable(owner, name, issue.openedUserName)){
-        updateIssue(owner, name, issue.issueId, form.title, form.content)
-        redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
-      } else Unauthorized
-    } getOrElse NotFound
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      getIssue(owner, name, params("id")).map { issue =>
+        if(isEditable(owner, name, issue.openedUserName)){
+          updateIssue(owner, name, issue.issueId, form.title, form.content)
+          redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
+        } else Unauthorized
+      } getOrElse NotFound
+    }
   })
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
@@ -147,15 +145,24 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
-    val owner = repository.owner
-    val name  = repository.name
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      getComment(owner, name, params("id")).map { comment =>
+        if(isEditable(owner, name, comment.commentedUserName)){
+          updateComment(comment.commentId, form.content)
+          redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
+        } else Unauthorized
+      } getOrElse NotFound
+    }
+  })
 
-    getComment(owner, name, params("id")).map { comment =>
-      if(isEditable(owner, name, comment.commentedUserName)){
-        updateComment(comment.commentId, form.content)
-        redirect(s"/${owner}/${name}/issue_comments/_data/${comment.commentId}")
-      } else Unauthorized
-    } getOrElse NotFound
+  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 =>
@@ -194,17 +201,17 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/new")(collaboratorsOnly { repository =>
-    val issueId = params("id").toInt
-
-    registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
-    issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    defining(params("id").toInt){ issueId =>
+      registerIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/label/delete")(collaboratorsOnly { repository =>
-    val issueId = params("id").toInt
-
-    deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
-    issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    defining(params("id").toInt){ issueId =>
+      deleteIssueLabel(repository.owner, repository.name, issueId, params("labelId").toInt)
+      issues.html.labellist(getIssueLabels(repository.owner, repository.name, issueId))
+    }
   })
 
   ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
@@ -223,41 +230,41 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
-    val action = params.get("value")
-
-    executeBatch(repository) {
-      handleComment(_, None, repository)( _ => action)
-    }
-  })
-
-  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    val labelId = params("value").toInt
-
-    executeBatch(repository) { issueId =>
-      getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-        registerIssueLabel(repository.owner, repository.name, issueId, labelId)
+    defining(params.get("value")){ action =>
+      executeBatch(repository) {
+        handleComment(_, None, repository)( _ => action)
       }
     }
   })
 
-  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
-    val value = assignedUserName("value")
+  post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
+    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
+  })
 
-    executeBatch(repository) {
-      updateAssignedUserName(repository.owner, repository.name, _, value)
+  post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
+    defining(assignedUserName("value")){ value =>
+      executeBatch(repository) {
+        updateAssignedUserName(repository.owner, repository.name, _, value)
+      }
     }
   })
 
   post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
-    val value = milestoneId("value")
-
-    executeBatch(repository) {
-      updateMilestoneId(repository.owner, repository.name, _, value)
+    defining(milestoneId("value")){ value =>
+      executeBatch(repository) {
+        updateMilestoneId(repository.owner, repository.name, _, value)
+      }
     }
   })
 
   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
@@ -273,89 +280,89 @@ trait IssuesControllerBase extends ControllerBase {
   private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo)
       (getAction: model.Issue => Option[String] =
            p1 => params.get("action").filter(_ => isEditable(p1.userName, p1.repositoryName, p1.openedUserName))) = {
-    val owner    = repository.owner
-    val name     = repository.name
-    val userName = context.loginAccount.get.userName
 
-    getIssue(owner, name, issueId.toString) map { issue =>
-      val (action, recordActivity) =
-        getAction(issue)
-          .collect {
+    defining(repository.owner, repository.name){ case (owner, name) =>
+      val userName = context.loginAccount.get.userName
+
+      getIssue(owner, name, issueId.toString) map { issue =>
+        val (action, recordActivity) =
+          getAction(issue)
+            .collect {
             case "close"  => true  -> (Some("close")  ->
-                Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
+              Some(if(issue.isPullRequest) recordClosePullRequestActivity _ else recordCloseIssueActivity _))
             case "reopen" => false -> (Some("reopen") ->
-                Some(recordReopenIssueActivity _))
+              Some(recordReopenIssueActivity _))
           }
-          .map { case (closed, t) =>
+            .map { case (closed, t) =>
             updateClosed(owner, name, issueId, closed)
             t
           }
-          .getOrElse(None -> None)
+            .getOrElse(None -> None)
 
-      val commentId = content
+        val commentId = content
           .map       ( _ -> action.map( _ + "_comment" ).getOrElse("comment") )
           .getOrElse ( action.get.capitalize -> action.get )
-          match {
-            case (content, action) => createComment(owner, name, userName, issueId, content, action)
-          }
+        match {
+          case (content, action) => createComment(owner, name, userName, issueId, content, action)
+        }
 
-      // record activity
-      content foreach {
-        (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
-        (owner, name, userName, issueId, _)
-      }
-      recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
+        // record activity
+        content foreach {
+          (if(issue.isPullRequest) recordCommentPullRequestActivity _ else recordCommentIssueActivity _)
+          (owner, name, userName, issueId, _)
+        }
+        recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
 
-      // notifications
-      Notifier() match {
-        case f =>
-          content foreach {
-            f.toNotify(repository, issueId, _){
-              Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
-                if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
+        // notifications
+        Notifier() match {
+          case f =>
+            content foreach {
+              f.toNotify(repository, issueId, _){
+                Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
+                  if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
+              }
             }
-          }
-          action foreach {
-            f.toNotify(repository, issueId, _){
-              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+            action foreach {
+              f.toNotify(repository, issueId, _){
+                Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+              }
             }
-          }
-      }
+        }
 
-      issue -> commentId
+        issue -> commentId
+      }
     }
   }
 
   private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
-    val owner      = repository.owner
-    val repoName   = repository.name
-    val filterUser = Map(filter -> params.getOrElse("userName", ""))
-    val page = IssueSearchCondition.page(request)
-    val sessionKey = s"${owner}/${repoName}/issues"
+    defining(repository.owner, repository.name){ case (owner, repoName) =>
+      val filterUser = Map(filter -> params.getOrElse("userName", ""))
+      val page       = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Issues(owner, repoName)
 
-    // retrieve search condition
-    val condition = if(request.getQueryString == null){
-      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
-    } else IssueSearchCondition(request)
+      // retrieve search condition
+      val condition = session.putAndGet(sessionKey,
+        if(request.hasQueryString) IssueSearchCondition(request)
+        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )
 
-    session.put(sessionKey, condition)
-
-    issues.html.list(
-        searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
-        page,
-        (getCollaborators(owner, repoName) :+ owner).sorted,
-        getMilestones(owner, repoName),
-        getLabels(owner, repoName),
-        countIssue(condition.copy(state = "open"), filterUser, false, owner -> repoName),
-        countIssue(condition.copy(state = "closed"), filterUser, false, owner -> repoName),
-        countIssue(condition, Map.empty, false, owner -> repoName),
-        context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), false, owner -> repoName)),
-        context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), false, owner -> repoName)),
-        countIssueGroupByLabels(owner, repoName, condition, filterUser),
-        condition,
-        filter,
-        repository,
-        hasWritePermission(owner, repoName, context.loginAccount))
+      issues.html.list(
+          searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
+          page,
+          (getCollaborators(owner, repoName) :+ owner).sorted,
+          getMilestones(owner, repoName),
+          getLabels(owner, repoName),
+          countIssue(condition.copy(state = "open"), filterUser, false, owner -> repoName),
+          countIssue(condition.copy(state = "closed"), filterUser, false, owner -> repoName),
+          countIssue(condition, Map.empty, false, owner -> repoName),
+          context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), false, owner -> repoName)),
+          context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), false, owner -> repoName)),
+          countIssueGroupByLabels(owner, repoName, condition, filterUser),
+          condition,
+          filter,
+          repository,
+          hasWritePermission(owner, repoName, context.loginAccount))
+    }
   }
 
 }

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

@@ -1,8 +1,10 @@
 package app
 
-import util.{LockUtil, CollaboratorsAuthenticator, JGitUtil, ReferrerAuthenticator, Notifier}
+import util.{LockUtil, CollaboratorsAuthenticator, JGitUtil, ReferrerAuthenticator, Notifier, Keys}
 import util.Directory._
 import util.Implicits._
+import util.ControlUtil._
+import util.FileUtil._
 import service._
 import org.eclipse.jgit.api.Git
 import jp.sf.amateras.scalatra.forms._
@@ -14,7 +16,6 @@ import org.eclipse.jgit.api.MergeCommand.FastForwardMode
 import service.IssuesService._
 import service.PullRequestService._
 import util.JGitUtil.DiffInfo
-import scala.Some
 import service.RepositoryService.RepositoryTreeNode
 import util.JGitUtil.CommitInfo
 
@@ -23,7 +24,7 @@ class PullRequestsController extends PullRequestsControllerBase
   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 =>
 
   val pullRequestForm = mapping(
@@ -62,156 +63,121 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   get("/:owner/:repository/pull/:id")(referrersOnly { repository =>
-    val owner   = repository.owner
-    val name    = repository.name
-    val issueId = params("id").toInt
+    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) =
+            getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
 
-    getPullRequest(owner, name, issueId) map { case(issue, pullreq) =>
-      JGitUtil.withGit(getRepositoryDir(owner, name)){ git =>
-        val requestCommitId = git.getRepository.resolve(pullreq.requestBranch)
+          pulls.html.pullreq(
+            issue, pullreq,
+            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
+  })
 
-        val (commits, diffs) =
-          getRequestCompareInfo(owner, name, pullreq.commitIdFrom, owner, name, pullreq.commitIdTo)
-
-        pulls.html.pullreq(
-          issue, pullreq,
-          getComments(owner, name, issueId.toInt),
-          (getCollaborators(owner, name) :+ owner).sorted,
-          getMilestonesWithIssueCount(owner, name),
-          commits,
-          diffs,
-          if(issue.closed){
-            false
-          } else {
-            checkConflict(owner, name, pullreq.branch, owner, name, pullreq.requestBranch)
-          },
-          hasWritePermission(owner, name, context.loginAccount),
-          repository,
+  ajaxGet("/:owner/:repository/pull/:id/mergeguide")(collaboratorsOnly { repository =>
+    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),
+          pullreq,
           s"${baseUrl}${context.path}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
       }
-
     } getOrElse NotFound
   })
 
   post("/:owner/:repository/pull/:id/merge", mergeForm)(collaboratorsOnly { (form, repository) =>
-    LockUtil.lock(s"${repository.owner}/${repository.name}/merge"){
-      val issueId = params("id").toInt
+    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)
+          withTmpDir(new java.io.File(getTemporaryDir(owner, name), s"merge-${issueId}")){ tmpdir =>
+            using(Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(pullreq.branch).call){ git =>
 
-      getPullRequest(repository.owner, repository.name, issueId).map { case (issue, pullreq) =>
-        val remote = getRepositoryDir(repository.owner, repository.name)
-        val tmpdir = new java.io.File(getTemporaryDir(repository.owner, repository.name), s"merge-${issueId}")
-        val git = Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(pullreq.branch).call
+              // mark issue as merged and close.
+              val loginAccount = context.loginAccount.get
+              createComment(owner, name, loginAccount.userName, issueId, form.message, "merge")
+              createComment(owner, name, loginAccount.userName, issueId, "Close", "close")
+              updateClosed(owner, name, issueId, true)
 
-        try {
-          // mark issue as merged and close.
-          val loginAccount = context.loginAccount.get
-          createComment(repository.owner, repository.name, loginAccount.userName, issueId, form.message, "merge")
-          createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
-          updateClosed(repository.owner, repository.name, issueId, true)
+              // record activity
+              recordMergeActivity(owner, name, loginAccount.userName, issueId, form.message)
 
-          // record activity
-          recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
+              // fetch pull request to temporary working repository
+              val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
 
-          // TODO apply ref comment
+              git.fetch
+                .setRemote(getRepositoryDir(owner, name).toURI.toString)
+                .setRefSpecs(new RefSpec(s"refs/pull/${issueId}/head:refs/heads/${pullRequestBranchName}")).call
 
-          // fetch pull request to temporary working repository
-          val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
+              // merge pull request
+              git.checkout.setName(pullreq.branch).call
 
-          git.fetch
-            .setRemote(getRepositoryDir(repository.owner, repository.name).toURI.toString)
-            .setRefSpecs(new RefSpec(s"refs/pull/${issueId}/head:refs/heads/${pullRequestBranchName}")).call
+              val result = git.merge
+                .include(git.getRepository.resolve(pullRequestBranchName))
+                .setFastForward(FastForwardMode.NO_FF)
+                .setCommit(false)
+                .call
 
-          // merge pull request
-          git.checkout.setName(pullreq.branch).call
+              if(result.getConflicts != null){
+                throw new RuntimeException("This pull request can't merge automatically.")
+              }
 
-          val result = git.merge
-            .include(git.getRepository.resolve(pullRequestBranchName))
-            .setFastForward(FastForwardMode.NO_FF)
-            .setCommit(false)
-            .call
+              // merge commit
+              git.getRepository.writeMergeCommitMsg(
+                s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n"
+                + form.message)
 
-          if(result.getConflicts != null){
-            throw new RuntimeException("This pull request can't merge automatically.")
-          }
+              git.commit
+                .setCommitter(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+                .call
 
-          // merge commit
-          git.getRepository.writeMergeCommitMsg(
-            s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n"
-            + form.message)
+              // push
+              git.push.call
 
-          git.commit
-            .setCommitter(new PersonIdent(loginAccount.userName, loginAccount.mailAddress))
-            .call
+              val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
+                pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
 
-          // push
-          git.push.call
+              commits.flatten.foreach { commit =>
+                if(!existsCommitId(owner, name, commit.id)){
+                  insertCommitId(owner, name, commit.id)
+                }
+              }
 
-          val (commits, _) = getRequestCompareInfo(repository.owner, repository.name, pullreq.commitIdFrom,
-            pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)
+              // notifications
+              Notifier().toNotify(repository, issueId, "merge"){
+                Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
+              }
 
-          commits.flatten.foreach { commit =>
-            if(!existsCommitId(repository.owner, repository.name, commit.id)){
-              insertCommitId(repository.owner, repository.name, commit.id)
+              redirect(s"/${owner}/${name}/pull/${issueId}")
             }
           }
-
-          // notifications
-          Notifier().toNotify(repository, issueId, "merge"){
-            Notifier.msgStatus(s"${baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
-          }
-
-          redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
-
-        } finally {
-          git.getRepository.close
-          FileUtils.deleteDirectory(tmpdir)
         }
-      } getOrElse NotFound
-    }
+      }
+    } getOrElse NotFound
   })
 
-  /**
-   * Checks whether conflict will be caused in merging.
-   * Returns true if conflict will be caused.
-   */
-  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)
-      }
-
-      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)
-      }
-    }
-  }
-
   get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
     (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
       case (Some(originUserName), Some(originRepositoryName)) => {
         getRepository(originUserName, originRepositoryName, baseUrl).map { originRepository =>
-          withGit(
-            getRepositoryDir(originUserName, originRepositoryName),
-            getRepositoryDir(forkedRepository.owner, forkedRepository.name)
+          using(
+            Git.open(getRepositoryDir(originUserName, originRepositoryName)),
+            Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
           ){ (oldGit, newGit) =>
             val oldBranch = JGitUtil.getDefaultBranch(oldGit, originRepository).get._2
             val newBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository).get._2
@@ -221,9 +187,12 @@ trait PullRequestsControllerBase extends ControllerBase {
         } getOrElse NotFound
       }
       case _ => {
-        JGitUtil.withGit(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}")
+        using(Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))){ git =>
+          JGitUtil.getDefaultBranch(git, forkedRepository).map { case (_, defaultBranch) =>
+            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}/compare/${defaultBranch}...${defaultBranch}")
+          } getOrElse {
+            redirect(s"${context.path}/${forkedRepository.owner}/${forkedRepository.name}")
+          }
         }
       }
     }
@@ -235,11 +204,11 @@ trait PullRequestsControllerBase extends ControllerBase {
     val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, repository.owner)
 
     (getRepository(originOwner, repository.name, baseUrl),
-     getRepository(forkedOwner,   repository.name, baseUrl)) match {
+     getRepository(forkedOwner, repository.name, baseUrl)) match {
       case (Some(originRepository), Some(forkedRepository)) => {
-        withGit(
-          getRepositoryDir(originOwner, repository.name),
-          getRepositoryDir(forkedOwner,   repository.name)
+        using(
+          Git.open(getRepositoryDir(originOwner, repository.name)),
+          Git.open(getRepositoryDir(forkedOwner, repository.name))
         ){ case (oldGit, newGit) =>
           val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
           val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
@@ -265,7 +234,6 @@ trait PullRequestsControllerBase extends ControllerBase {
             forkedBranch,
             oldId.getName,
             newId.getName,
-            checkConflict(originOwner, repository.name, originBranch, forkedOwner, repository.name, forkedBranch),
             repository,
             originRepository,
             forkedRepository,
@@ -276,6 +244,29 @@ trait PullRequestsControllerBase extends ControllerBase {
     }
   })
 
+  ajaxGet("/:owner/:repository/compare/*...*/mergecheck")(collaboratorsOnly { repository =>
+    val Seq(origin, forked) = multiParams("splat")
+    val (originOwner, tmpOriginBranch) = parseCompareIdentifie(origin, repository.owner)
+    val (forkedOwner, tmpForkedBranch) = parseCompareIdentifie(forked, repository.owner)
+
+    (getRepository(originOwner, repository.name, baseUrl),
+      getRepository(forkedOwner, repository.name, baseUrl)) match {
+      case (Some(originRepository), Some(forkedRepository)) => {
+        using(
+          Git.open(getRepositoryDir(originOwner, repository.name)),
+          Git.open(getRepositoryDir(forkedOwner, repository.name))
+        ){ case (oldGit, newGit) =>
+          val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
+          val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2
+
+          pulls.html.mergecheck(
+            checkConflict(originOwner, repository.name, originBranch, forkedOwner, repository.name, forkedBranch))
+        }
+      }
+      case _ => NotFound()
+    }
+  })
+
   post("/:owner/:repository/pulls/new", pullRequestForm)(referrersOnly { (form, repository) =>
     val loginUserName = context.loginAccount.get.userName
 
@@ -301,7 +292,7 @@ trait PullRequestsControllerBase extends ControllerBase {
       commitIdTo            = form.commitIdTo)
 
     // fetch requested branch
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       git.fetch
         .setRemote(getRepositoryDir(form.requestUserName, repository.name).toURI.toString)
         .setRefSpecs(new RefSpec(s"refs/heads/${form.requestBranch}:refs/pull/${issueId}/head"))
@@ -320,16 +311,29 @@ trait PullRequestsControllerBase extends ControllerBase {
   })
 
   /**
-   * Handles w Git object simultaneously.
+   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
    */
-  private def withGit[T](oldDir: java.io.File, newDir: java.io.File)(action: (Git, Git) => T): T = {
-    val oldGit = Git.open(oldDir)
-    val newGit = Git.open(newDir)
-    try {
-      action(oldGit, newGit)
-    } finally {
-      oldGit.getRepository.close
-      newGit.getRepository.close
+  private def checkConflict(userName: String, repositoryName: String, branch: String,
+                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
+    // TODO Are there more quick way?
+    LockUtil.lock(s"${userName}/${repositoryName}/merge-check"){
+      val remote = getRepositoryDir(userName, repositoryName)
+      withTmpDir(new java.io.File(getTemporaryDir(userName, repositoryName), "merge-check")){ tmpdir =>
+        using(Git.cloneRepository.setDirectory(tmpdir).setURI(remote.toURI.toString).setBranch(branch).call){ git =>
+
+          git.checkout.setName(branch).call
+
+          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
+        }
+      }
     }
   }
 
@@ -366,9 +370,9 @@ trait PullRequestsControllerBase extends ControllerBase {
   private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
       requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) = {
 
-    withGit(
-      getRepositoryDir(userName, repositoryName),
-      getRepositoryDir(requestUserName, requestRepositoryName)
+    using(
+      Git.open(getRepositoryDir(userName, repositoryName)),
+      Git.open(getRepositoryDir(requestUserName, requestRepositoryName))
     ){ (oldGit, newGit) =>
       val oldId = oldGit.getRepository.resolve(branch)
       val newId = newGit.getRepository.resolve(requestCommitId)
@@ -385,31 +389,29 @@ trait PullRequestsControllerBase extends ControllerBase {
     }
   }
 
-  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) = {
-    val owner      = repository.owner
-    val repoName   = repository.name
-    val filterUser = userName.map { x => Map("created_by" -> x) } getOrElse Map("all" -> "")
-    val page = IssueSearchCondition.page(request)
-    val sessionKey = s"${owner}/${repoName}/pulls"
+  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
+    defining(repository.owner, repository.name){ case (owner, repoName) =>
+      val filterUser = userName.map { x => Map("created_by" -> x) } getOrElse Map("all" -> "")
+      val page       = IssueSearchCondition.page(request)
+      val sessionKey = Keys.Session.Pulls(owner, repoName)
 
-    // retrieve search condition
-    val condition = if(request.getQueryString == null){
-      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
-    } else IssueSearchCondition(request)
+      // retrieve search condition
+      val condition = session.putAndGet(sessionKey,
+        if(request.hasQueryString) IssueSearchCondition(request)
+        else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition())
+      )
 
-    session.put(sessionKey, condition)
-
-    pulls.html.list(
-      searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
-      getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)),
-      userName,
-      page,
-      countIssue(condition.copy(state = "open"), filterUser, true, owner -> repoName),
-      countIssue(condition.copy(state = "closed"), filterUser, true, owner -> repoName),
-      countIssue(condition, Map.empty, true, owner -> repoName),
-      condition,
-      repository,
-      hasWritePermission(owner, repoName, context.loginAccount))
-  }
+      pulls.html.list(
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
+        getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)),
+        userName,
+        page,
+        countIssue(condition.copy(state = "open"  ), filterUser, true, owner -> repoName),
+        countIssue(condition.copy(state = "closed"), filterUser, true, owner -> repoName),
+        countIssue(condition, Map.empty, true, owner -> repoName),
+        condition,
+        repository,
+        hasWritePermission(owner, repoName, context.loginAccount))
+    }
 
 }

src/main/scala/app/RepositorySettingsController.scala

@@ -6,13 +6,20 @@ import util.{UsersAuthenticator, OwnerAuthenticator}
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.FlashMapSupport
+import service.WebHookService.WebHookPayload
+import util.JGitUtil.CommitInfo
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
 
 class RepositorySettingsController extends RepositorySettingsControllerBase
-  with RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator
+  with RepositoryService with AccountService with WebHookService
+  with OwnerAuthenticator with UsersAuthenticator
 
 trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSupport {
-  self: RepositoryService with AccountService with OwnerAuthenticator with UsersAuthenticator =>
+  self: RepositoryService with AccountService with WebHookService
+    with OwnerAuthenticator with UsersAuthenticator =>
 
+  // for repository options
   case class OptionsForm(description: Option[String], defaultBranch: String, isPrivate: Boolean)
   
   val optionsForm = mapping(
@@ -20,13 +27,21 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
     "defaultBranch" -> trim(label("Default Branch" , text(required, maxlength(100)))),
     "isPrivate"     -> trim(label("Repository Type", boolean()))
   )(OptionsForm.apply)
-  
+
+  // for collaborator addition
   case class CollaboratorForm(userName: String)
 
   val collaboratorForm = mapping(
     "userName" -> trim(label("Username", text(required, collaborator)))
   )(CollaboratorForm.apply)
 
+  // for web hook url addition
+  case class WebHookForm(url: String)
+
+  val webHookForm = mapping(
+    "url" -> trim(label("url", text(required, webHook)))
+  )(WebHookForm.apply)
+
   /**
    * Redirect to the Options page.
    */
@@ -88,6 +103,56 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
     redirect(s"/${repository.owner}/${repository.name}/settings/collaborators")
   })
 
+  /**
+   * Display the web hook page.
+   */
+  get("/:owner/:repository/settings/hooks")(ownerOnly { repository =>
+    settings.html.hooks(getWebHookURLs(repository.owner, repository.name), repository, flash.get("info"))
+  })
+
+  /**
+   * Add the web hook URL.
+   */
+  post("/:owner/:repository/settings/hooks/add", webHookForm)(ownerOnly { (form, repository) =>
+    addWebHookURL(repository.owner, repository.name, form.url)
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Delete the web hook URL.
+   */
+  get("/:owner/:repository/settings/hooks/delete")(ownerOnly { repository =>
+    deleteWebHookURL(repository.owner, repository.name, params("url"))
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
+  /**
+   * Send the test request to registered web hook URLs.
+   */
+  get("/:owner/:repository/settings/hooks/test")(ownerOnly { repository =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      import scala.collection.JavaConverters._
+      val commits = git.log
+        .add(git.getRepository.resolve(repository.repository.defaultBranch))
+        .setMaxCount(3)
+        .call.iterator.asScala.map(new CommitInfo(_))
+
+      val webHookURLs = getWebHookURLs(repository.owner, repository.name)
+      if(webHookURLs.nonEmpty){
+        callWebHook(repository.owner, repository.name, webHookURLs,
+          WebHookPayload(
+            git,
+            "refs/heads/" + repository.repository.defaultBranch,
+            repository,
+            commits.toList,
+            getAccountByUserName(repository.owner).get))
+      }
+
+      flash += "info" -> "Test payload deployed!"
+    }
+    redirect(s"/${repository.owner}/${repository.name}/settings/hooks")
+  })
+
   /**
    * Display the delete repository page.
    */
@@ -108,19 +173,27 @@ trait RepositorySettingsControllerBase extends ControllerBase with FlashMapSuppo
     redirect(s"/${repository.owner}")
   })
 
+  /**
+   * Provides duplication check for web hook url.
+   */
+  private def webHook: Constraint = new Constraint(){
+    override def validate(name: String, value: String): Option[String] =
+      getWebHookURLs(params("owner"), params("repository")).map(_.url).find(_ == value).map(_ => "URL had been registered already.")
+  }
+
   /**
    * Provides Constraint to validate the collaborator name.
    */
   private def collaborator: Constraint = new Constraint(){
-    override def validate(name: String, value: String): Option[String] = {
-      val paths = request.getRequestURI.split("/")
+    override def validate(name: String, value: String): Option[String] =
       getAccountByUserName(value) match {
         case None => Some("User does not exist.")
-        case Some(x) if(x.userName == paths(1) || getCollaborators(paths(1), paths(2)).contains(x.userName))
+        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

@@ -2,6 +2,7 @@ package app
 
 import util.Directory._
 import util.Implicits._
+import util.ControlUtil._
 import _root_.util.{ReferrerAuthenticator, JGitUtil, FileUtil, StringUtil}
 import service._
 import org.scalatra._
@@ -10,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
@@ -36,7 +38,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   get("/:owner/:repository")(referrersOnly {
     fileList(_)
   })
-  
+
   /**
    * Displays the file list of the specified path and branch.
    */
@@ -48,15 +50,15 @@ 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)
 
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
         case Right((logs, hasNext)) =>
           repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
@@ -75,7 +77,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     val (id, path) = splitPath(repository, multiParams("splat").head)
     val raw = params.get("raw").getOrElse("false").toBoolean
 
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
 
       @scala.annotation.tailrec
@@ -84,19 +86,18 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         case true => getPathObjectId(path, walk)
       }
 
-      val treeWalk = new TreeWalk(git.getRepository)
-      val objectId = try {
+      val objectId = using(new TreeWalk(git.getRepository)){ treeWalk =>
         treeWalk.addTree(revCommit.getTree)
         treeWalk.setRecursive(true)
         getPathObjectId(path, treeWalk)
-      } finally {
-        treeWalk.release
       }
 
       if(raw){
         // Download
-        contentType = "application/octet-stream"
-        JGitUtil.getContent(git, objectId, false).get
+        defining(JGitUtil.getContent(git, objectId, false).get){ bytes =>
+          contentType = FileUtil.getContentType(path, bytes)
+          bytes
+        }
       } else {
         // Viewer
         val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
@@ -120,30 +121,30 @@ trait RepositoryViewerControllerBase extends ControllerBase {
       }
     }
   })
-  
+
   /**
    * Displays details of the specified commit.
    */
   get("/:owner/:repository/commit/:id")(referrersOnly { repository =>
     val id = params("id")
 
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      JGitUtil.getDiffs(git, id) match { case (diffs, oldCommitId) =>
-        repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
-          JGitUtil.getBranchesOfCommit(git, revCommit.getName),
-          JGitUtil.getTagsOfCommit(git, revCommit.getName),
-          repository, diffs, oldCommitId)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      defining(JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))){ revCommit =>
+        JGitUtil.getDiffs(git, id) match { case (diffs, oldCommitId) =>
+          repo.html.commit(id, new JGitUtil.CommitInfo(revCommit),
+            JGitUtil.getBranchesOfCommit(git, revCommit.getName),
+            JGitUtil.getTagsOfCommit(git, revCommit.getName),
+            repository, diffs, oldCommitId)
+        }
       }
     }
   })
-  
+
   /**
    * Displays branches.
    */
   get("/:owner/:repository/branches")(referrersOnly { repository =>
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
       // retrieve latest update date of each branch
       val branchInfo = repository.branchList.map { branchName =>
         val revCommit = git.log.add(git.getRepository.resolve(branchName)).setMaxCount(1).call.iterator.next
@@ -165,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)
@@ -173,25 +174,35 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         FileUtils.deleteDirectory(workDir)
       }
       workDir.mkdirs
-      
-      // clone the repository
-      val cloneDir = new File(workDir, revision)
-      JGitUtil.withGit(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 {
@@ -233,26 +244,26 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     if(repository.commitCount == 0){
       repo.html.guide(repository)
     } else {
-      JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
         val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
         // get specified commit
-      JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
-          val revCommit = JGitUtil.getRevCommitFromId(git, objectId)
-
+        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
+          defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit =>
           // get files
-          val files = JGitUtil.getFileList(git, revision, path)
-          // process README.md
-          val readme = files.find(_.name == "README.md").map { file =>
-            StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
-          }
+            val files = JGitUtil.getFileList(git, revision, path)
+            // process README.md
+            val readme = files.find(_.name == "README.md").map { file =>
+              StringUtil.convertFromByteArray(JGitUtil.getContent(Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
+            }
 
-          repo.html.files(revision, repository,
-            if(path == ".") Nil else path.split("/").toList, // current path
-            new JGitUtil.CommitInfo(revCommit), // latest commit
-            files, readme)
+            repo.html.files(revision, repository,
+              if(path == ".") Nil else path.split("/").toList, // current path
+              new JGitUtil.CommitInfo(revCommit), // latest commit
+              files, readme)
+          }
         } getOrElse NotFound
       }
     }
   }
   
-}
+}

src/main/scala/app/SearchController.scala

@@ -1,6 +1,7 @@
 package app
 
 import util._
+import ControlUtil._
 import service._
 import jp.sf.amateras.scalatra.forms._
 
@@ -26,25 +27,25 @@ trait SearchControllerBase extends ControllerBase { self: RepositoryService
   }
 
   get("/:owner/:repository/search")(referrersOnly { repository =>
-    val query  = params("q").trim
-    val target = params.getOrElse("type", "code")
-    val page   = try {
-      val i = params.getOrElse("page", "1").toInt
-      if(i <= 0) 1 else i
-    } catch {
-      case e: NumberFormatException => 1
-    }
+    defining(params("q").trim, params.getOrElse("type", "code")){ case (query, target) =>
+      val page   = try {
+        val i = params.getOrElse("page", "1").toInt
+        if(i <= 0) 1 else i
+      } catch {
+        case e: NumberFormatException => 1
+      }
 
-    target.toLowerCase match {
-      case "issue" => search.html.issues(
-        searchIssues(repository.owner, repository.name, query),
-        countFiles(repository.owner, repository.name, query),
-        query, page, repository)
+      target.toLowerCase match {
+        case "issue" => search.html.issues(
+          searchIssues(repository.owner, repository.name, query),
+          countFiles(repository.owner, repository.name, query),
+          query, page, repository)
 
-      case _ => search.html.code(
-        searchFiles(repository.owner, repository.name, query),
-        countIssues(repository.owner, repository.name, query),
-        query, page, repository)
+        case _ => search.html.code(
+          searchFiles(repository.owner, repository.name, query),
+          countIssues(repository.owner, repository.name, query),
+          query, page, repository)
+      }
     }
   })
 

src/main/scala/app/SignInController.scala

@@ -2,6 +2,9 @@ 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
 
@@ -17,16 +20,15 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
   get("/signin"){
     val redirect = params.get("redirect")
     if(redirect.isDefined && redirect.get.startsWith("/")){
-      session.setAttribute("REDIRECT", redirect.get)
+      session.setAttribute(Keys.Session.Redirect, redirect.get)
     }
     html.signin(loadSystemSettings())
   }
 
   post("/signin", form){ form =>
-    val settings = loadSystemSettings()
     authenticate(loadSystemSettings(), form.userName, form.password) match {
       case Some(account) => signin(account)
-      case None => redirect("/signin")
+      case None          => redirect("/signin")
     }
   }
 
@@ -39,12 +41,15 @@ trait SignInControllerBase extends ControllerBase { self: SystemSettingsService
    * Set account information into HttpSession and redirect.
    */
   private def signin(account: model.Account) = {
-    session.setAttribute("LOGIN_ACCOUNT", account)
+    session.setAttribute(Keys.Session.LoginAccount, account)
     updateLastLoginDate(account.userName)
 
-    session.get("REDIRECT").map { redirectUrl =>
-      session.removeAttribute("REDIRECT")
-      redirect(redirectUrl.asInstanceOf[String])
+    session.getAndRemove[String](Keys.Session.Redirect).map { redirectUrl =>
+      if(redirectUrl.replaceFirst("/$", "") == request.getContextPath){
+        redirect("/")
+      } else {
+        redirect(urlEncode(redirectUrl).replaceAll("%2F", "/"))
+      }
     }.getOrElse {
       redirect("/")
     }

src/main/scala/app/SystemSettingsController.scala

@@ -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(

src/main/scala/app/UserManagementController.scala

@@ -3,6 +3,7 @@ package app
 import service._
 import util.AdminAuthenticator
 import util.StringUtil._
+import util.ControlUtil._
 import jp.sf.amateras.scalatra.forms._
 
 class UserManagementController extends UserManagementControllerBase
@@ -11,10 +12,12 @@ 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,
+  case class EditUserForm(userName: String, password: Option[String], fullName: String,
+                          mailAddress: String, isAdmin: Boolean,
                           url: Option[String], fileId: Option[String], clearImage: Boolean)
 
   case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String],
@@ -26,6 +29,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   val newUserForm = mapping(
     "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier, uniqueUserName))),
     "password"    -> trim(label("Password"     , text(required, maxlength(20)))),
+    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress()))),
     "isAdmin"     -> trim(label("User Type"    , boolean())),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
@@ -35,6 +39,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   val editUserForm = mapping(
     "userName"    -> trim(label("Username"     , text(required, maxlength(100), identifier))),
     "password"    -> trim(label("Password"     , optional(text(maxlength(20))))),
+    "fullName"    -> trim(label("Full Name"    , text(required, maxlength(100)))),
     "mailAddress" -> trim(label("Mail Address" , text(required, maxlength(100), uniqueMailAddress("userName")))),
     "isAdmin"     -> trim(label("User Type"    , boolean())),
     "url"         -> trim(label("URL"          , optional(text(maxlength(200))))),
@@ -43,7 +48,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   )(EditUserForm.apply)
 
   val newGroupForm = mapping(
-    "groupName"   -> trim(label("Group name"   , text(required, maxlength(100), identifier))),
+    "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())))
@@ -70,7 +75,7 @@ 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")
   })
@@ -85,6 +90,7 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
     getAccountByUserName(userName).map { account =>
       updateAccount(getAccountByUserName(userName).get.copy(
         password     = form.password.map(sha1).getOrElse(account.password),
+        fullName     = form.fullName,
         mailAddress  = form.mailAddress,
         isAdmin      = form.isAdmin,
         url          = form.url))
@@ -107,33 +113,33 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
   })
 
   get("/admin/users/:groupName/_editgroup")(adminOnly {
-    val groupName = params("groupName")
-    admin.users.html.group(getAccountByUserName(groupName), getGroupMembers(groupName))
+    defining(params("groupName")){ groupName =>
+      admin.users.html.group(getAccountByUserName(groupName), getGroupMembers(groupName))
+    }
   })
 
   post("/admin/users/:groupName/_editgroup", editGroupForm)(adminOnly { form =>
-    val groupName = params("groupName")
-    getAccountByUserName(groupName).map { account =>
-      updateGroup(groupName, form.url)
+    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)
 
-      val memberNames = form.memberNames.map(_.split(",").toList).getOrElse(Nil)
-      updateGroupMembers(form.groupName, memberNames)
-
-      getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
-        removeCollaborators(form.groupName, repositoryName)
-        memberNames.foreach { userName =>
-          addCollaborator(form.groupName, repositoryName, userName)
+        getRepositoryNamesOfUser(form.groupName).foreach { repositoryName =>
+          removeCollaborators(form.groupName, repositoryName)
+          memberNames.foreach { userName =>
+            addCollaborator(form.groupName, repositoryName, userName)
+          }
         }
-      }
 
-      updateImage(form.groupName, form.fileId, form.clearImage)
-      redirect("/admin/users")
+        updateImage(form.groupName, form.fileId, form.clearImage)
+        redirect("/admin/users")
 
-    } getOrElse NotFound
+      } getOrElse NotFound
+    }
   })
 
   post("/admin/users/_usercheck")(adminOnly {
     getAccountByUserName(params("userName")).isDefined
   })
 
-}
+}

src/main/scala/app/WikiController.scala

@@ -1,32 +1,39 @@
 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 service.WikiService.WikiPageInfo
+import scala.Some
 
 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 =>
@@ -40,13 +47,13 @@ trait WikiControllerBase extends ControllerBase {
 
     getWikiPage(repository.owner, repository.name, pageName).map { page =>
       wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
-    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${pageName}/_edit") // TODO URLEncode
+    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
   })
   
   get("/:owner/:repository/wiki/:page/_history")(referrersOnly { repository =>
     val pageName = StringUtil.urlDecode(params("page"))
 
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, "master", path = pageName + ".md") match {
         case Right((logs, hasNext)) => wiki.html.history(Some(pageName), logs, repository)
         case Left(_) => NotFound
@@ -56,36 +63,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("\\.\\.\\.")
 
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
-      wiki.html.compare(Some(pageName), JGitUtil.getDiffs(git, commitId(0), commitId(1), true), repository)
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+      wiki.html.compare(Some(pageName), from, to, JGitUtil.getDiffs(git, from, to, true), 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("\\.\\.\\.")
 
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
-      wiki.html.compare(None, JGitUtil.getDiffs(git, commitId(0), commitId(1), true), repository)
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
+      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 {
@@ -93,25 +124,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 =>
@@ -120,7 +152,7 @@ trait WikiControllerBase extends ControllerBase {
   })
   
   get("/:owner/:repository/wiki/_history")(referrersOnly { repository =>
-    JGitUtil.withGit(getWikiRepositoryDir(repository.owner, repository.name)){ git =>
+    using(Git.open(getWikiRepositoryDir(repository.owner, repository.name))){ git =>
       JGitUtil.getCommitLog(git, "master") match {
         case Right((logs, hasNext)) => wiki.html.history(None, logs, repository)
         case Left(_) => NotFound
@@ -129,9 +161,11 @@ 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
   })
 
@@ -151,5 +185,22 @@ trait WikiControllerBase extends ControllerBase {
       }
   }
 
+  private def conflictForNew: Constraint = new Constraint(){
+    override def validate(name: String, value: String): Option[String] = {
+      optionIf(targetWikiPage.nonEmpty){
+        Some("Someone has created the wiki since you started. Please reload this page and re-apply your changes.")
+      }
+    }
+  }
 
-}
+  private def conflictForEdit: Constraint = new Constraint(){
+    override def validate(name: String, value: String): Option[String] = {
+      optionIf(targetWikiPage.map(_.id != params("id")).getOrElse(true)){
+        Some("Someone has edited the wiki since you started. Please reload this page and re-apply your changes.")
+      }
+    }
+  }
+
+  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,12 @@ 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 * = userName ~ fullName ~ mailAddress ~ password ~ isAdmin ~ url.? ~ registeredDate ~ updatedDate ~ lastLoginDate.? ~ image.? ~ groupAccount <> (Account, Account.unapply _)
 }
 
 case class Account(
     userName: String,
+    fullName: String,
     mailAddress: String,
     password: String,
     isAdmin: Boolean,

src/main/scala/model/WebHook.scala

@@ -0,0 +1,16 @@
+package model
+
+import scala.slick.driver.H2Driver.simple._
+
+object WebHooks extends Table[WebHook]("WEB_HOOK") with BasicTemplate {
+  def url = column[String]("URL")
+  def * = userName ~ repositoryName ~ url <> (WebHook, WebHook.unapply _)
+
+  def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
+}
+
+case class WebHook(
+  userName: String,
+  repositoryName: String,
+  url: String
+)

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,11 +40,14 @@ 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)
+      }
     }
   }
 
@@ -53,10 +59,11 @@ trait AccountService {
 
   def getAllUsers(): List[Account] = Query(Accounts) 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,
@@ -69,9 +76,10 @@ trait AccountService {
   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.? }
       .update (
         account.password, 
+        account.fullName, 
         account.mailAddress, 
         account.isAdmin,
         account.url,
@@ -89,6 +97,7 @@ trait AccountService {
     Accounts insert Account(
       userName       = groupName,
       password       = "",
+      fullName       = groupName,
       mailAddress    = groupName + "@devnull",
       isAdmin        = false,
       url            = url,
@@ -123,3 +132,5 @@ trait AccountService {
       .list
 
 }
+
+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

@@ -2,21 +2,18 @@ package service
 
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
-
 import model._
+import util.ControlUtil._
 
 trait PullRequestService { self: IssuesService =>
   import PullRequestService._
 
-  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] = {
-    val issue = getIssue(owner, repository, issueId.toString)
-    if(issue.isDefined){
-      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption match {
-        case Some(pullreq) => Some((issue.get, pullreq))
-        case None          => None
+  def getPullRequest(owner: String, repository: String, issueId: Int): Option[(Issue, PullRequest)] =
+    getIssue(owner, repository, issueId.toString).flatMap{ issue =>
+      Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).firstOption.map{
+        pullreq => (issue, pullreq)
       }
-    } else None
-  }
+    }
 
   def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
     Query(PullRequests)
@@ -54,4 +51,4 @@ object PullRequestService {
 
   case class PullRequestCount(userName: String, count: Int)
 
-}
+}

src/main/scala/service/RepositorySearchService.scala

@@ -2,6 +2,7 @@ package service
 
 import util.{FileUtil, StringUtil, JGitUtil}
 import util.Directory._
+import util.ControlUtil._
 import model.Issue
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
@@ -9,7 +10,8 @@ import scala.collection.mutable.ListBuffer
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
 
-trait RepositorySearchService { self: IssuesService =>
+trait
+RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
 
   def countIssues(owner: String, repository: String, query: String): Int =
@@ -27,12 +29,12 @@ trait RepositorySearchService { self: IssuesService =>
     }
 
   def countFiles(owner: String, repository: String, query: String): Int =
-    JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
+    using(Git.open(getRepositoryDir(owner, repository))){ git =>
       if(JGitUtil.isEmpty(git)) 0 else searchRepositoryFiles(git, query).length
     }
 
   def searchFiles(owner: String, repository: String, query: String): List[FileSearchResult] =
-    JGitUtil.withGit(getRepositoryDir(owner, repository)){ git =>
+    using(Git.open(getRepositoryDir(owner, repository))){ git =>
       if(JGitUtil.isEmpty(git)){
         Nil
       } else {

src/main/scala/service/RepositoryService.scala

@@ -47,8 +47,10 @@ trait RepositoryService { self: AccountService =>
     Labels        .filter(_.byRepository(userName, repositoryName)).delete
     IssueComments .filter(_.byRepository(userName, repositoryName)).delete
     Issues        .filter(_.byRepository(userName, repositoryName)).delete
+    PullRequests  .filter(_.byRepository(userName, repositoryName)).delete
     IssueId       .filter(_.byRepository(userName, repositoryName)).delete
     Milestones    .filter(_.byRepository(userName, repositoryName)).delete
+    WebHooks      .filter(_.byRepository(userName, repositoryName)).delete
     Repositories  .filter(_.byRepository(userName, repositoryName)).delete
   }
 
@@ -199,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

@@ -1,73 +1,80 @@
 package service
 
 import util.Directory._
+import util.ControlUtil._
 import SystemSettingsService._
 
 trait SystemSettingsService {
 
   def saveSystemSettings(settings: SystemSettings): Unit = {
-    val props = new java.util.Properties()
-    props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
-    props.setProperty(Gravatar, settings.gravatar.toString)
-    props.setProperty(Notification, settings.notification.toString)
-    if(settings.notification) {
-      settings.smtp.foreach { smtp =>
-        props.setProperty(SmtpHost, smtp.host)
-        smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
-        smtp.user.foreach(props.setProperty(SmtpUser, _))
-        smtp.password.foreach(props.setProperty(SmtpPassword, _))
-        smtp.ssl.foreach(x => props.setProperty(SmtpSsl, x.toString))
+    defining(new java.util.Properties()){ props =>
+      props.setProperty(AllowAccountRegistration, settings.allowAccountRegistration.toString)
+      props.setProperty(Gravatar, settings.gravatar.toString)
+      props.setProperty(Notification, settings.notification.toString)
+      if(settings.notification) {
+        settings.smtp.foreach { smtp =>
+          props.setProperty(SmtpHost, smtp.host)
+          smtp.port.foreach(x => props.setProperty(SmtpPort, x.toString))
+          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)
-    if(settings.ldapAuthentication){
-      settings.ldap.map { ldap =>
-        props.setProperty(LdapHost, ldap.host)
-        ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
-        ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
-        ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
-        props.setProperty(LdapBaseDN, ldap.baseDN)
-        props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
-        props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+      props.setProperty(LdapAuthentication, settings.ldapAuthentication.toString)
+      if(settings.ldapAuthentication){
+        settings.ldap.map { ldap =>
+          props.setProperty(LdapHost, ldap.host)
+          ldap.port.foreach(x => props.setProperty(LdapPort, x.toString))
+          ldap.bindDN.foreach(x => props.setProperty(LdapBindDN, x))
+          ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
+          props.setProperty(LdapBaseDN, ldap.baseDN)
+          props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+        }
       }
+      props.store(new java.io.FileOutputStream(GitBucketConf), null)
     }
-    props.store(new java.io.FileOutputStream(GitBucketConf), null)
   }
 
 
   def loadSystemSettings(): SystemSettings = {
-    val props = new java.util.Properties()
-    if(GitBucketConf.exists){
-      props.load(new java.io.FileInputStream(GitBucketConf))
-    }
-    SystemSettings(
-      getValue(props, AllowAccountRegistration, false),
-      getValue(props, Gravatar, true),
-      getValue(props, Notification, false),
-      if(getValue(props, Notification, false)){
-        Some(Smtp(
-          getValue(props, SmtpHost, ""),
-          getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
-          getOptionValue(props, SmtpUser, None),
-          getOptionValue(props, SmtpPassword, None),
-          getOptionValue[Boolean](props, SmtpSsl, None)))
-      } else {
-        None
-      },
-      getValue(props, LdapAuthentication, false),
-      if(getValue(props, LdapAuthentication, false)){
-        Some(Ldap(
-          getValue(props, LdapHost, ""),
-          getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
-          getOptionValue(props, LdapBindDN, None),
-          getOptionValue(props, LdapBindPassword, None),
-          getValue(props, LdapBaseDN, ""),
-          getValue(props, LdapUserNameAttribute, ""),
-          getValue(props, LdapMailAddressAttribute, "")))
-      } else {
-        None
+    defining(new java.util.Properties()){ props =>
+      if(GitBucketConf.exists){
+        props.load(new java.io.FileInputStream(GitBucketConf))
       }
-    )
+      SystemSettings(
+        getValue(props, AllowAccountRegistration, false),
+        getValue(props, Gravatar, true),
+        getValue(props, Notification, false),
+        if(getValue(props, Notification, false)){
+          Some(Smtp(
+            getValue(props, SmtpHost, ""),
+            getOptionValue(props, SmtpPort, Some(DefaultSmtpPort)),
+            getOptionValue(props, SmtpUser, None),
+            getOptionValue(props, SmtpPassword, None),
+            getOptionValue[Boolean](props, SmtpSsl, None),
+            getOptionValue(props, SmtpFromAddress, None),
+            getOptionValue(props, SmtpFromName, None)))
+        } else {
+          None
+        },
+        getValue(props, LdapAuthentication, false),
+        if(getValue(props, LdapAuthentication, false)){
+          Some(Ldap(
+            getValue(props, LdapHost, ""),
+            getOptionValue(props, LdapPort, Some(DefaultLdapPort)),
+            getOptionValue(props, LdapBindDN, None),
+            getOptionValue(props, LdapBindPassword, None),
+            getValue(props, LdapBaseDN, ""),
+            getValue(props, LdapUserNameAttribute, ""),
+            getValue(props, LdapMailAddressAttribute, "")))
+        } else {
+          None
+        }
+      )
+    }
   }
 
 }
@@ -97,7 +104,9 @@ object SystemSettingsService {
     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
@@ -110,6 +119,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"
@@ -119,23 +130,23 @@ object SystemSettingsService {
   private val LdapUserNameAttribute = "ldap.username_attribute"
   private val LdapMailAddressAttribute = "ldap.mail_attribute"
 
-  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A = {
-    val value = props.getProperty(key)
-    if(value == null || value.isEmpty) default
-    else convertType(value).asInstanceOf[A]
-  }
+  private def getValue[A: ClassTag](props: java.util.Properties, key: String, default: A): A =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else convertType(value).asInstanceOf[A]
+    }
 
-  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] = {
-    val value = props.getProperty(key)
-    if(value == null || value.isEmpty) default
-    else Some(convertType(value)).asInstanceOf[Option[A]]
-  }
+  private def getOptionValue[A: ClassTag](props: java.util.Properties, key: String, default: Option[A]): Option[A] =
+    defining(props.getProperty(key)){ value =>
+      if(value == null || value.isEmpty) default
+      else Some(convertType(value)).asInstanceOf[Option[A]]
+    }
 
-  private def convertType[A: ClassTag](value: String) = {
-    val c = implicitly[ClassTag[A]].runtimeClass
-    if(c == classOf[Boolean])  value.toBoolean
-    else if(c == classOf[Int]) value.toInt
-    else value
-  }
+  private def convertType[A: ClassTag](value: String) =
+    defining(implicitly[ClassTag[A]].runtimeClass){ c =>
+      if(c == classOf[Boolean])  value.toBoolean
+      else if(c == classOf[Int]) value.toInt
+      else value
+    }
 
 }

src/main/scala/service/WebHookService.scala

@@ -0,0 +1,143 @@
+package service
+
+import scala.slick.driver.H2Driver.simple._
+import Database.threadLocalSession
+
+import model._
+import org.slf4j.LoggerFactory
+import service.RepositoryService.RepositoryInfo
+import util.JGitUtil
+import org.eclipse.jgit.diff.DiffEntry
+import util.JGitUtil.CommitInfo
+import org.eclipse.jgit.api.Git
+import org.apache.http.message.BasicNameValuePair
+import org.apache.http.client.entity.UrlEncodedFormEntity
+import org.apache.http.protocol.HTTP
+import org.apache.http.NameValuePair
+
+trait WebHookService {
+  import WebHookService._
+
+  private val logger = LoggerFactory.getLogger(classOf[WebHookService])
+
+  def getWebHookURLs(owner: String, repository: String): List[WebHook] =
+    Query(WebHooks).filter(_.byRepository(owner, repository)).sortBy(_.url).list
+
+  def addWebHookURL(owner: String, repository: String, url :String): Unit =
+    WebHooks.insert(WebHook(owner, repository, url))
+
+  def deleteWebHookURL(owner: String, repository: String, url :String): Unit =
+    Query(WebHooks).filter(_.byPrimaryKey(owner, repository, url)).delete
+
+  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.HttpClientBuilder
+    import scala.concurrent._
+    import ExecutionContext.Implicits.global
+
+    logger.debug("start callWebHook")
+    implicit val formats = Serialization.formats(NoTypeHints)
+
+    if(webHookURLs.nonEmpty){
+      val json = write(payload)
+      val httpClient = HttpClientBuilder.create.build
+
+      webHookURLs.foreach { webHookUrl =>
+        val f = future {
+          logger.debug(s"start web hook invocation for ${webHookUrl}")
+          val httpPost = new HttpPost(webHookUrl.url)
+
+          val params: java.util.List[NameValuePair] = new java.util.ArrayList()
+          params.add(new BasicNameValuePair("payload", json))
+          httpPost.setEntity(new UrlEncodedFormEntity(params, "UTF-8"))
+
+          httpClient.execute(httpPost)
+          httpPost.releaseConnection()
+          logger.debug(s"end web hook invocation for ${webHookUrl}")
+        }
+        f.onSuccess {
+          case s => logger.debug(s"Success: web hook request to ${webHookUrl.url}")
+        }
+        f.onFailure {
+          case t => logger.error(s"Failed: web hook request to ${webHookUrl.url}", t)
+        }
+      }
+    }
+    logger.debug("end callWebHook")
+  }
+
+}
+
+object WebHookService {
+
+  case class WebHookPayload(
+    ref: String,
+    commits: List[WebHookCommit],
+    repository: WebHookRepository)
+
+  object WebHookPayload {
+    def apply(git: Git, refName: String, repositoryInfo: RepositoryInfo,
+              commits: List[CommitInfo], repositoryOwner: Account): WebHookPayload =
+      WebHookPayload(
+        refName,
+        commits.map { commit =>
+          val diffs = JGitUtil.getDiffs(git, commit.id, false)
+          val commitUrl = repositoryInfo.url.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/commit/" + commit.id
+
+          WebHookCommit(
+            id        = commit.id,
+            message   = commit.fullMessage,
+            timestamp = commit.time.toString,
+            url       = commitUrl,
+            added     = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.ADD)    => x.newPath },
+            removed   = diffs._1.collect { case x if(x.changeType == DiffEntry.ChangeType.DELETE) => x.oldPath },
+            modified  = diffs._1.collect { case x if(x.changeType != DiffEntry.ChangeType.ADD &&
+              x.changeType != DiffEntry.ChangeType.DELETE) => x.newPath },
+            author    = WebHookUser(
+              name  = commit.committer,
+              email = commit.mailAddress
+            )
+          )
+        }.toList,
+        WebHookRepository(
+          name        = repositoryInfo.name,
+          url         = repositoryInfo.url,
+          description = repositoryInfo.repository.description.getOrElse(""),
+          watchers    = 0,
+          forks       = repositoryInfo.forkedCount,
+          `private`   = repositoryInfo.repository.isPrivate,
+          owner = WebHookUser(
+            name  = repositoryOwner.userName,
+            email = repositoryOwner.mailAddress
+          )
+        )
+      )
+  }
+
+  case class WebHookCommit(
+    id: String,
+    message: String,
+    timestamp: String,
+    url: String,
+    added: List[String],
+    removed: List[String],
+    modified: List[String],
+    author: WebHookUser)
+
+  case class WebHookRepository(
+    name: String,
+    url: String,
+    description: String,
+    watchers: Int,
+    forks: Int,
+    `private`: Boolean,
+    owner: WebHookUser)
+
+  case class WebHookUser(
+    name: String,
+    email: String)
+
+}

src/main/scala/service/WikiService.scala

@@ -4,7 +4,11 @@ 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.{StringUtil, Directory, JGitUtil, LockUtil}
+import util.ControlUtil._
+import org.eclipse.jgit.treewalk.CanonicalTreeParser
+import org.eclipse.jgit.diff.DiffFormatter
+import org.eclipse.jgit.api.errors.PatchApplyException
 
 object WikiService {
   
@@ -15,8 +19,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.
@@ -33,40 +38,40 @@ object WikiService {
 trait WikiService {
   import WikiService._
 
-  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit = {
+  def createWikiRepository(loginAccount: model.Account, owner: String, repository: String): Unit =
     LockUtil.lock(s"${owner}/${repository}/wiki"){
-      val dir = Directory.getWikiRepositoryDir(owner, repository)
-      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))
+      defining(Directory.getWikiRepositoryDir(owner, repository)){ dir =>
+        if(!dir.exists){
+          try {
+            JGitUtil.initRepository(dir)
+            saveWikiPage(owner, repository, "Home", "Home", s"Welcome to the ${repository} wiki!!", loginAccount, "Initial Commit", None)
+          } finally {
+            // once delete cloned repository because initial cloned repository does not have 'branch.master.merge'
+            FileUtils.deleteDirectory(Directory.getWikiWorkDir(owner, repository))
+          }
         }
       }
     }
-  }
-  
+
   /**
    * Returns the wiki page.
    */
   def getWikiPage(owner: String, repository: String, pageName: String): Option[WikiPageInfo] = {
-    JGitUtil.withGit(Directory.getWikiRepositoryDir(owner, repository)){ git =>
-      if(!JGitUtil.isEmpty(git)){
+    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)
         }
-      } else None
+      }
     }
   }
 
   /**
    * Returns the content of the specified file.
    */
-  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] = {
-    JGitUtil.withGit(Directory.getWikiRepositoryDir(owner, repository)){ git =>
-      if(!JGitUtil.isEmpty(git)){
+  def getFileContent(owner: String, repository: String, path: String): Option[Array[Byte]] =
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
+      optionIf(!JGitUtil.isEmpty(git)){
         val index = path.lastIndexOf('/')
         val parentPath = if(index < 0) "."  else path.substring(0, index)
         val fileName   = if(index < 0) path else path.substring(index + 1)
@@ -74,59 +79,119 @@ trait WikiService {
         JGitUtil.getFileList(git, "master", parentPath).find(_.name == fileName).map { file =>
           git.getRepository.open(file.id).getBytes
         }
-      } else None
+      }
     }
-  }
 
   /**
    * Returns the list of wiki page names.
    */
   def getWikiPageList(owner: String, repository: String): List[String] = {
-    JGitUtil.withGit(Directory.getWikiRepositoryDir(owner, repository)){ git =>
+    using(Git.open(Directory.getWikiRepositoryDir(owner, repository))){ git =>
       JGitUtil.getFileList(git, "master", ".")
         .filter(_.name.endsWith(".md"))
         .map(_.name.replaceFirst("\\.md$", ""))
         .sortBy(x => x)
     }
   }
-  
+
+  /**
+   * Reverts specified changes.
+   */
+  def revertWikiPage(owner: String, repository: String, from: String, to: String,
+                     committer: model.Account, pageName: Option[String]): Boolean = {
+    LockUtil.lock(s"${owner}/${repository}/wiki"){
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
+        // clone working copy
+        cloneOrPullWorkingCopy(workDir, owner, repository)
+
+        using(Git.open(workDir)){ git =>
+          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}"))
+
+          import scala.collection.JavaConverters._
+          val diffs = git.diff.setNewTree(oldTreeIter).setOldTree(newTreeIter).call.asScala.filter { diff =>
+            pageName match {
+              case Some(x) => diff.getNewPath == x + ".md"
+              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")
+          }
+
+          try {
+            git.apply.setPatch(new java.io.ByteArrayInputStream(patch.getBytes("UTF-8"))).call
+            git.add.addFilepattern(".").call
+            git.commit.setCommitter(committer.fullName, committer.mailAddress).setMessage(pageName match {
+              case Some(x) => s"Revert ${from} ... ${to} on ${x}"
+              case None    => s"Revert ${from} ... ${to}"
+            }).call
+            git.push.call
+            true
+          } catch {
+            case ex: PatchApplyException => false
+          }
+        }
+      }
+    }
+  }
+
+
   /**
    * 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"){
-      // clone working copy
-      val workDir = Directory.getWikiWorkDir(owner, repository)
-      cloneOrPullWorkingCopy(workDir, owner, repository)
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
+        // clone working copy
+        cloneOrPullWorkingCopy(workDir, owner, repository)
 
-      // write as file
-      JGitUtil.withGit(workDir){ git =>
-        val file = new File(workDir, newPageName + ".md")
-        val added = if(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
-          FileUtils.writeStringToFile(file, content, "UTF-8")
-          git.add.addFilepattern(file.getName).call
-          true
-        } else {
-          false
-        }
+        // write as file
+        using(Git.open(workDir)){ git =>
+          defining(new File(workDir, newPageName + ".md")){ file =>
+            // new page
+            val created = !file.exists
 
-        // delete file
-        val deleted = if(currentPageName != "" && currentPageName != newPageName){
-          git.rm.addFilepattern(currentPageName + ".md").call
-          true
-        } else {
-          false
-        }
+            // created or updated
+            val added = executeIf(!file.exists || FileUtils.readFileToString(file, "UTF-8") != content){
+              FileUtils.writeStringToFile(file, content, "UTF-8")
+              git.add.addFilepattern(file.getName).call
+            }
 
-        // commit and push
-        if(added || deleted){
-          val commit = git.commit.setCommitter(committer.userName, committer.mailAddress).setMessage(message).call
-          git.push.call
-          Some(commit.getName)
-        } else {
-          None
+            // delete file
+            val deleted = executeIf(currentPageName != "" && currentPageName != newPageName){
+              git.rm.addFilepattern(currentPageName + ".md").call
+            }
+
+            // commit and push
+            optionIf(added || deleted){
+              defining(git.commit.setCommitter(committer.fullName, committer.mailAddress)
+                .setMessage(if(message.trim.length == 0){
+                    if(deleted){
+                      s"Rename ${currentPageName} to ${newPageName}"
+                    } else if(created){
+                      s"Created ${newPageName}"
+                    } else {
+                      s"Updated ${newPageName}"
+                    }
+                  } else {
+                    message
+                  }).call){ commit =>
+                git.push.call
+                Some(commit.getName)
+              }
+            }
+          }
         }
       }
     }
@@ -138,36 +203,35 @@ trait WikiService {
   def deleteWikiPage(owner: String, repository: String, pageName: String,
                      committer: String, mailAddress: String, message: String): Unit = {
     LockUtil.lock(s"${owner}/${repository}/wiki"){
-      // clone working copy
-      val workDir = Directory.getWikiWorkDir(owner, repository)
-      cloneOrPullWorkingCopy(workDir, owner, repository)
+      defining(Directory.getWikiWorkDir(owner, repository)){ workDir =>
+        // clone working copy
+        cloneOrPullWorkingCopy(workDir, owner, repository)
 
-      // delete file
-      new File(workDir, pageName + ".md").delete
-    
-      JGitUtil.withGit(workDir){ git =>
-        git.rm.addFilepattern(pageName + ".md").call
-    
-        // commit and push
-        git.commit.setAuthor(committer, mailAddress).setMessage(message).call
-        git.push.call
+        // delete file
+        new File(workDir, pageName + ".md").delete
+
+        using(Git.open(workDir)){ git =>
+          git.rm.addFilepattern(pageName + ".md").call
+
+          // commit and push
+          git.commit.setCommitter(committer, mailAddress).setMessage(message).call
+          git.push.call
+        }
       }
     }
   }
 
   private def cloneOrPullWorkingCopy(workDir: File, owner: String, repository: String): Unit = {
     if(!workDir.exists){
-      val git =
-        Git.cloneRepository
-          .setURI(Directory.getWikiRepositoryDir(owner, repository).toURI.toString)
-          .setDirectory(workDir)
-          .call
-      git.getRepository.close  // close .git resources.
-    } else {
-      JGitUtil.withGit(workDir){ git =>
-        git.pull.call
-      }
+      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,12 +1,14 @@
 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
+import util.Directory._
+import util.ControlUtil._
+import org.eclipse.jgit.api.Git
 
 object AutoUpdate {
   
@@ -26,15 +28,14 @@ object AutoUpdate {
      */
     def update(conn: Connection): Unit = {
       val sqlPath = s"update/${majorVersion}_${minorVersion}.sql"
-      val in = Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)
-      if(in != null){
-        val sql = IOUtils.toString(in, "UTF-8")
-        val stmt = conn.createStatement()
-        try {
-          logger.debug(sqlPath + "=" + sql)
-          stmt.executeUpdate(sql)
-        } finally {
-          stmt.close()
+
+      using(Thread.currentThread.getContextClassLoader.getResourceAsStream(sqlPath)){ in =>
+        if(in != null){
+          val sql = IOUtils.toString(in, "UTF-8")
+          using(conn.createStatement()){ stmt =>
+            logger.debug(sqlPath + "=" + sql)
+            stmt.executeUpdate(sql)
+          }
         }
       }
     }
@@ -49,28 +50,32 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    Version(1, 7),
+    Version(1, 6),
     Version(1, 5),
     Version(1, 4),
     new Version(1, 3){
       override def update(conn: Connection): Unit = {
         super.update(conn)
         // Fix wiki repository configuration
-        val rs = conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")
-        while(rs.next){
-          val wikidir = Directory.getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))
-          val repository = org.eclipse.jgit.api.Git.open(wikidir).getRepository
-          val config = repository.getConfig
-          if(!config.getBoolean("http", "receivepack", false)){
-            config.setBoolean("http", null, "receivepack", true)
-            config.save
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
+          while(rs.next){
+            using(Git.open(getWikiRepositoryDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME")))){ git =>
+              defining(git.getRepository.getConfig){ config =>
+                if(!config.getBoolean("http", "receivepack", false)){
+                  config.setBoolean("http", null, "receivepack", true)
+                  config.save
+                }
+              }
+            }
           }
-          repository.close
         }
       }
     },
     Version(1, 2),
     Version(1, 1),
-    Version(1, 0)
+    Version(1, 0),
+    Version(0, 0)
   )
   
   /**
@@ -81,7 +86,7 @@ object AutoUpdate {
   /**
    * The version file (GITBUCKET_HOME/version).
    */
-  val versionFile = new File(Directory.GitBucketHome, "version")
+  val versionFile = new File(GitBucketHome, "version")
   
   /**
    * Returns the current version from the version file.
@@ -105,37 +110,50 @@ object AutoUpdate {
 }
 
 /**
- * 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 = {
-    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${Directory.DatabaseHome}")
-    super.contextInitialized(event)
-    logger.debug("H2 started")
-    
+    org.h2.Driver.load()
+    event.getServletContext.setInitParameter("db.url", s"jdbc:h2:${DatabaseHome}")
+
     logger.debug("Start schema update")
-    val conn = getConnection()
-    try {
-      val currentVersion = getCurrentVersion()
-      if(currentVersion == headVersion){
-        logger.debug("No update")
-      } 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)
-      }
-    } catch {
-      case ex: Throwable => {
-        logger.error("Failed to schema update", ex)
-        ex.printStackTrace()
-        conn.rollback()
+    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(s"Updated from ${currentVersion.versionString} to ${headVersion.versionString}")
+          }
+        }
+      } catch {
+        case ex: Throwable => {
+          logger.error("Failed to schema update", ex)
+          ex.printStackTrace()
+          conn.rollback()
+        }
       }
     }
     logger.debug("End schema update")
   }
-  
-}
+
+  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/BasicAuthenticationFilter.scala

@@ -4,6 +4,9 @@ import javax.servlet._
 import javax.servlet.http._
 import service.{SystemSettingsService, AccountService, RepositoryService}
 import org.slf4j.LoggerFactory
+import util.Implicits._
+import util.ControlUtil._
+import util.Keys
 
 /**
  * Provides BASIC Authentication for [[servlet.GitRepositoryServlet]].
@@ -25,29 +28,30 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
     }
 
     try {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-      val repositoryOwner = paths(2)
-      val repositoryName  = paths(3).replaceFirst("\\.git$", "")
-
-      getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki", ""), "") match {
-        case Some(repository) => {
-          if(!request.getRequestURI.endsWith("/git-receive-pack") &&
+      defining(request.paths){ case Array(_, repositoryOwner, repositoryName, _*) =>
+        getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", ""), "") match {
+          case Some(repository) => {
+            if(!request.getRequestURI.endsWith("/git-receive-pack") &&
               !"service=git-receive-pack".equals(request.getQueryString) && !repository.repository.isPrivate){
-            chain.doFilter(req, wrappedResponse)
-          } else {
-            request.getHeader("Authorization") match {
-              case null => requireAuth(response)
-              case auth => decodeAuthHeader(auth).split(":") match {
-                case Array(username, password) if(isWritableUser(username, password, repository)) => {
-                  request.setAttribute("USER_NAME", username)
-                  chain.doFilter(req, wrappedResponse)
+              chain.doFilter(req, wrappedResponse)
+            } else {
+              request.getHeader("Authorization") match {
+                case null => requireAuth(response)
+                case auth => decodeAuthHeader(auth).split(":") match {
+                  case Array(username, password) if(isWritableUser(username, password, repository)) => {
+                    request.setAttribute(Keys.Request.UserName, username)
+                    chain.doFilter(req, wrappedResponse)
+                  }
+                  case _ => requireAuth(response)
                 }
-                case _ => requireAuth(response)
               }
             }
           }
+          case None => {
+            logger.debug(s"Repository ${repositoryOwner}/${repositoryName} is not found.")
+            response.sendError(HttpServletResponse.SC_NOT_FOUND)
+          }
         }
-        case None => response.sendError(HttpServletResponse.SC_NOT_FOUND)
       }
     } catch {
       case ex: Exception => {

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -9,8 +9,13 @@ import org.slf4j.LoggerFactory
 import javax.servlet.ServletConfig
 import javax.servlet.ServletContext
 import javax.servlet.http.HttpServletRequest
-import util.{JGitUtil, Directory}
+import util.{Keys, JGitUtil, Directory}
+import util.ControlUtil._
+import util.Implicits._
 import service._
+import WebHookService._
+import org.eclipse.jgit.api.Git
+import util.JGitUtil.CommitInfo
 
 /**
  * Provides Git repository via HTTP.
@@ -51,68 +56,105 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
   
   override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
     val receivePack = new ReceivePack(db)
-    val userName = request.getAttribute("USER_NAME").asInstanceOf[String]
+    val userName = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]
 
     logger.debug("requestURI: " + request.getRequestURI)
     logger.debug("userName:" + userName)
 
-    val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-    val owner      = paths(2)
-    val repository = paths(3).replaceFirst("\\.git$", "")
-    
-    logger.debug("repository:" + owner + "/" + repository)
+    defining(request.paths){ paths =>
+      val owner      = paths(1)
+      val repository = paths(2).replaceFirst("\\.git$", "")
+      val baseURL    = request.getRequestURL.toString.replaceFirst("/git/.*", "")
 
-    receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, userName))
-    receivePack
+      logger.debug("repository:" + owner + "/" + repository)
+      logger.debug("baseURL:" + baseURL)
+
+      receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, userName, baseURL))
+      receivePack
+    }
   }
 }
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, userName: String) extends PostReceiveHook
-  with RepositoryService with AccountService with IssuesService with ActivityService {
+class CommitLogHook(owner: String, repository: String, userName: String, baseURL: String) extends PostReceiveHook
+  with RepositoryService with AccountService with IssuesService with ActivityService with WebHookService {
   
   private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
   
   def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
-    JGitUtil.withGit(Directory.getRepositoryDir(owner, repository)) { git =>
+    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 _ =>
           }
         }
+
+        // call web hook
+        val webHookURLs = getWebHookURLs(owner, repository)
+        if(webHookURLs.nonEmpty){
+          val payload = WebHookPayload(
+            git,
+            command.getRefName,
+            getRepository(owner, repository, baseURL).get,
+            newCommits,
+            getAccountByUserName(owner).get)
+
+          callWebHook(owner, repository, webHookURLs, payload)
+        }
       }
     }
     // update repository last modified time.
     updateLastActivityDate(owner, repository)
   }
+
+  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")
+      }
+    }
+  }
+
 }

src/main/scala/servlet/TransactionFilter.scala

@@ -21,9 +21,9 @@ class TransactionFilter extends Filter {
       chain.doFilter(req, res)
     } else {
       Database(req.getServletContext) withTransaction {
-        logger.debug("TODO begin transaction")
+        logger.debug("begin transaction")
         chain.doFilter(req, res)
-        logger.debug("TODO end transaction")
+        logger.debug("end transaction")
       }
     }
   }

src/main/scala/util/Authenticator.scala

@@ -3,6 +3,8 @@ package util
 import app.ControllerBase
 import service._
 import RepositoryService.RepositoryInfo
+import util.Implicits._
+import util.ControlUtil._
 
 /**
  * Allows only oneself and administrators.
@@ -13,11 +15,12 @@ trait OneselfAuthenticator { self: ControllerBase =>
 
   private def authenticate(action: => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-      context.loginAccount match {
-        case Some(x) if(x.isAdmin) => action
-        case Some(x) if(paths(1) == x.userName) => action
-        case _ => Unauthorized()
+      defining(request.paths){ paths =>
+        context.loginAccount match {
+          case Some(x) if(x.isAdmin) => action
+          case Some(x) if(paths(0) == x.userName) => action
+          case _ => Unauthorized()
+        }
       }
     }
   }
@@ -32,14 +35,15 @@ trait OwnerAuthenticator { self: ControllerBase with RepositoryService =>
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
-        context.loginAccount match {
-          case Some(x) if(x.isAdmin) => action(repository)
-          case Some(x) if(repository.owner == x.userName) => action(repository)
-          case _ => Unauthorized()
-        }
-      } getOrElse NotFound()
+      defining(request.paths){ paths =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
+          context.loginAccount match {
+            case Some(x) if(x.isAdmin) => action(repository)
+            case Some(x) if(repository.owner == x.userName) => action(repository)
+            case _ => Unauthorized()
+          }
+        } getOrElse NotFound()
+      }
     }
   }
 }
@@ -87,15 +91,16 @@ trait CollaboratorsAuthenticator { self: ControllerBase with RepositoryService =
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
-        context.loginAccount match {
-          case Some(x) if(x.isAdmin) => action(repository)
-          case Some(x) if(paths(1) == x.userName) => action(repository)
-          case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action(repository)
-          case _ => Unauthorized()
-        }
-      } getOrElse NotFound()
+      defining(request.paths){ paths =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
+          context.loginAccount match {
+            case Some(x) if(x.isAdmin) => action(repository)
+            case Some(x) if(paths(0) == x.userName) => action(repository)
+            case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
+            case _ => Unauthorized()
+          }
+        } getOrElse NotFound()
+      }
     }
   }
 }
@@ -109,19 +114,20 @@ trait ReferrerAuthenticator { self: ControllerBase with RepositoryService =>
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
-        if(!repository.repository.isPrivate){
-          action(repository)
-        } else {
-          context.loginAccount match {
-            case Some(x) if(x.isAdmin) => action(repository)
-            case Some(x) if(paths(1) == x.userName) => action(repository)
-            case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action(repository)
-            case _ => Unauthorized()
+      defining(request.paths){ paths =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
+          if(!repository.repository.isPrivate){
+            action(repository)
+          } else {
+            context.loginAccount match {
+              case Some(x) if(x.isAdmin) => action(repository)
+              case Some(x) if(paths(0) == x.userName) => action(repository)
+              case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
+              case _ => Unauthorized()
+            }
           }
-        }
-      } getOrElse NotFound()
+        } getOrElse NotFound()
+      }
     }
   }
 }
@@ -135,16 +141,17 @@ trait ReadableUsersAuthenticator { self: ControllerBase with RepositoryService =
 
   private def authenticate(action: (RepositoryInfo) => Any) = {
     {
-      val paths = request.getRequestURI.substring(request.getContextPath.length).split("/")
-      getRepository(paths(1), paths(2), baseUrl).map { repository =>
-        context.loginAccount match {
-          case Some(x) if(x.isAdmin) => action(repository)
-          case Some(x) if(!repository.repository.isPrivate) => action(repository)
-          case Some(x) if(paths(1) == x.userName) => action(repository)
-          case Some(x) if(getCollaborators(paths(1), paths(2)).contains(x.userName)) => action(repository)
-          case _ => Unauthorized()
-        }
-      } getOrElse NotFound()
+      defining(request.paths){ paths =>
+        getRepository(paths(0), paths(1), baseUrl).map { repository =>
+          context.loginAccount match {
+            case Some(x) if(x.isAdmin) => action(repository)
+            case Some(x) if(!repository.repository.isPrivate) => action(repository)
+            case Some(x) if(paths(0) == x.userName) => action(repository)
+            case Some(x) if(getCollaborators(paths(0), paths(1)).contains(x.userName)) => action(repository)
+            case _ => Unauthorized()
+          }
+        } getOrElse NotFound()
+      }
     }
   }
 }

src/main/scala/util/ControlUtil.scala

@@ -0,0 +1,48 @@
+package util
+
+import org.eclipse.jgit.api.Git
+import org.eclipse.jgit.revwalk.RevWalk
+import org.eclipse.jgit.treewalk.TreeWalk
+
+/**
+ * Provides control facilities.
+ */
+object ControlUtil {
+
+  def defining[A, B](value: A)(f: A => B): B = f(value)
+
+  def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B =
+    try f(resource) finally {
+      if(resource != null){
+        try {
+          resource.close()
+        } catch {
+          case e: Throwable => // ignore
+        }
+      }
+    }
+
+  def using[T](git: Git)(f: Git => T): T =
+    try f(git) finally git.getRepository.close
+
+  def using[T](git1: Git, git2: Git)(f: (Git, Git) => T): T =
+    try f(git1, git2) finally {
+      git1.getRepository.close
+      git2.getRepository.close
+    }
+
+  def using[T](revWalk: RevWalk)(f: RevWalk => T): T =
+    try f(revWalk) finally revWalk.release()
+
+  def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
+    try f(treeWalk) finally treeWalk.release()
+
+  def executeIf(condition: => Boolean)(action: => Unit): Boolean =
+    if(condition){
+      action
+      true
+    } else false
+
+  def optionIf[T](condition: => Boolean)(action: => Option[T]): Option[T] =
+    if(condition) action else None
+}

src/main/scala/util/Directory.scala

@@ -1,6 +1,7 @@
 package util
 
 import java.io.File
+import util.ControlUtil._
 
 /**
  * Provides directories used by GitBucket.
@@ -21,17 +22,17 @@ object Directory {
   /**
    * Repository names of the specified user.
    */
-  def getRepositories(owner: String): List[String] = {
-    val dir = new File(s"${RepositoryHome}/${owner}")
-    if(dir.exists){
-      dir.listFiles.filter { file =>
-        file.isDirectory && !file.getName.endsWith(".wiki.git") 
-      }.map(_.getName.replaceFirst("\\.git$", "")).toList
-    } else {
-      Nil
+  def getRepositories(owner: String): List[String] =
+    defining(new File(s"${RepositoryHome}/${owner}")){ dir =>
+      if(dir.exists){
+        dir.listFiles.filter { file =>
+          file.isDirectory && !file.getName.endsWith(".wiki.git")
+        }.map(_.getName.replaceFirst("\\.git$", "")).toList
+      } else {
+        Nil
+      }
     }
-  }
-  
+
   /**
    * Substance directory of the repository.
    */

src/main/scala/util/FileUtil.scala

@@ -1,56 +1,72 @@
 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 {
   
-  def getMimeType(name: String): String = {
-    val fileNameMap = URLConnection.getFileNameMap()
-    val mimeType = fileNameMap.getContentTypeFor(name)
-    if(mimeType == null){
-      "application/octeat-stream"
-    } else {
-      mimeType
+  def getMimeType(name: String): String =
+    defining(URLConnection.getFileNameMap()){ fileNameMap =>
+      fileNameMap.getContentTypeFor(name) match {
+        case null     => "application/octet-stream"
+        case mimeType => mimeType
+      }
+    }
+
+  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)
-        }
-      }
-    }
+//  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)
+//    }
+//  }
 
-    val out = new ZipArchiveOutputStream(dest)
-    try {
-      addDirectoryToZip(out, dir, dir.getName)
-    } finally {
-      IOUtils.closeQuietly(out)
-    }
+  def getFileName(path: String): String = defining(path.lastIndexOf('/')){ i =>
+    if(i >= 0) path.substring(i + 1) else path
   }
 
-  def getExtension(name: String): String = {
-    val index = name.lastIndexOf('.')
-    if(index >= 0){
-      name.substring(index + 1)
-    } else {
-      ""
+  def getExtension(name: String): String =
+    name.lastIndexOf('.') match {
+      case i if(i >= 0) => name.substring(i + 1)
+      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

@@ -1,6 +1,7 @@
 package util
 
 import scala.util.matching.Regex
+import javax.servlet.http.{HttpSession, HttpServletRequest}
 
 /**
  * Provides some usable implicit conversions.
@@ -12,7 +13,7 @@ object Implicits {
     def splitWith(condition: (A, A) => Boolean): Seq[Seq[A]] = split(seq)(condition)
 
     @scala.annotation.tailrec
-    private def split[A](list: Seq[A], result: Seq[Seq[A]] = Nil)(condition: (A, A) => Boolean): Seq[Seq[A]] = {
+    private def split[A](list: Seq[A], result: Seq[Seq[A]] = Nil)(condition: (A, A) => Boolean): Seq[Seq[A]] =
       list match {
         case x :: xs => {
           xs.span(condition(x, _)) match {
@@ -21,7 +22,6 @@ object Implicits {
         }
         case Nil => result
       }
-    }
   }
 
   implicit class RichString(value: String){
@@ -41,6 +41,38 @@ object Implicits {
       }
       sb.toString
     }
+
+    def toIntOpt: Option[Int] = try {
+      Option(Integer.parseInt(value))
+    } catch {
+      case e: NumberFormatException => None
+    }
   }
 
-}
+  implicit class RichRequest(request: HttpServletRequest){
+
+    def paths: Array[String] = request.getRequestURI.substring(request.getContextPath.length + 1).split("/")
+
+    def hasQueryString: Boolean = request.getQueryString != null
+
+    def hasAttribute(name: String): Boolean = request.getAttribute(name) != null
+
+  }
+
+  implicit class RichSession(session: HttpSession){
+
+    def putAndGet[T](key: String, value: T): T = {
+      session.setAttribute(key, value)
+      value
+    }
+
+    def getAndRemove[T](key: String): Option[T] = {
+      val value = session.getAttribute(key).asInstanceOf[T]
+      if(value == null){
+        session.removeAttribute(key)
+      }
+      Option(value)
+    }
+  }
+
+}

src/main/scala/util/JGitUtil.scala

@@ -3,6 +3,7 @@ package util
 import org.eclipse.jgit.api.Git
 import util.Directory._
 import util.StringUtil._
+import util.ControlUtil._
 import scala.collection.JavaConverters._
 import org.eclipse.jgit.lib._
 import org.eclipse.jgit.revwalk._
@@ -42,8 +43,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.
@@ -68,29 +71,17 @@ object JGitUtil {
         rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
-    val summary = {
-      val i = fullMessage.trim.indexOf("\n")
-      val firstLine = if(i >= 0){
-        fullMessage.trim.substring(0, i).trim
-      } else {
-        fullMessage
-      }
-      if(firstLine.length > shortMessage.length){
-        shortMessage
-      } else {
-        firstLine
+    val summary = defining(fullMessage.trim.indexOf("\n")){ i =>
+      defining(if(i >= 0) fullMessage.trim.substring(0, i).trim else fullMessage){ firstLine =>
+        if(firstLine.length > shortMessage.length) shortMessage else firstLine
       }
     }
 
-    val description = {
-      val i = fullMessage.trim.indexOf("\n")
-      if(i >= 0){
+    val description = defining(fullMessage.trim.indexOf("\n")){ i =>
+      optionIf(i >= 0){
         Some(fullMessage.trim.substring(i).trim)
-      } else {
-        None
       }
     }
-
   }
 
   case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
@@ -112,24 +103,6 @@ object JGitUtil {
    */
   case class TagInfo(name: String, time: Date, id: String)
 
-  /**
-   * Use this method to use the Git object.
-   * Repository resources are released certainly after processing.
-   */
-  def withGit[T](dir: java.io.File)(f: Git => T): T = withGit(Git.open(dir))(f)
-  
-  /**
-   * Use this method to use the Git object.
-   * Repository resources are released certainly after processing.
-   */
-  def withGit[T](git: Git)(f: Git => T): T = {
-    try {
-      f(git)
-    } finally {
-      git.getRepository.close
-    }
-  }
-  
   /**
    * Returns RevCommit from the commit or tag id.
    * 
@@ -141,7 +114,7 @@ object JGitUtil {
     val revWalk = new RevWalk(git.getRepository)
     val revCommit = revWalk.parseAny(objectId) match {
       case r: RevTag => revWalk.parseCommit(r.getObject)
-      case _ => revWalk.parseCommit(objectId)
+      case _         => revWalk.parseCommit(objectId)
     }
     revWalk.dispose
     revCommit
@@ -151,7 +124,7 @@ object JGitUtil {
    * Returns the repository information. It contains branch names and tag names.
    */
   def getRepositoryInfo(owner: String, repository: String, baseUrl: String): RepositoryInfo = {
-    withGit(getRepositoryDir(owner, repository)){ git =>
+    using(Git.open(getRepositoryDir(owner, repository))){ git =>
       try {
         // get commit count
         val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(1000).sum
@@ -188,45 +161,43 @@ object JGitUtil {
    * @return HTML of the file list
    */
   def getFileList(git: Git, revision: String, path: String = "."): List[FileInfo] = {
-    val revWalk = new RevWalk(git.getRepository)
-    val objectId = git.getRepository.resolve(revision)
-    val revCommit = revWalk.parseCommit(objectId)
-      
-    val treeWalk = new TreeWalk(git.getRepository)
-    treeWalk.addTree(revCommit.getTree)
-    if(path != "."){
-      treeWalk.setRecursive(true)
-      treeWalk.setFilter(new TreeFilter(){
-
-        var stopRecursive = false
-
-        def include(walker: TreeWalk): Boolean = {
-          val targetPath = walker.getPathString
-          if((path + "/").startsWith(targetPath)){
-            true
-          } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
-            stopRecursive = true
-            treeWalk.setRecursive(false)
-            true
-          } else {
-            false
-          }
-        }
-
-        def shouldBeRecursive(): Boolean = !stopRecursive
-
-        override def clone: TreeFilter = return this
-      })
-    }
-      
     val list = new scala.collection.mutable.ListBuffer[(ObjectId, FileMode, String, String)]
-    
-    while (treeWalk.next()) {
-      list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString))
+
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      val objectId  = git.getRepository.resolve(revision)
+      val revCommit = revWalk.parseCommit(objectId)
+
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
+        treeWalk.addTree(revCommit.getTree)
+        if(path != "."){
+          treeWalk.setRecursive(true)
+          treeWalk.setFilter(new TreeFilter(){
+
+            var stopRecursive = false
+
+            def include(walker: TreeWalk): Boolean = {
+              val targetPath = walker.getPathString
+              if((path + "/").startsWith(targetPath)){
+                true
+              } else if(targetPath.startsWith(path + "/") && targetPath.substring(path.length + 1).indexOf("/") < 0){
+                stopRecursive = true
+                treeWalk.setRecursive(false)
+                true
+              } else {
+                false
+              }
+            }
+
+            def shouldBeRecursive(): Boolean = !stopRecursive
+
+            override def clone: TreeFilter = return this
+          })
+        }
+        while (treeWalk.next()) {
+          list.append((treeWalk.getObjectId(0), treeWalk.getFileMode(0), treeWalk.getPathString, treeWalk.getNameString))
+        }
+      }
     }
-    
-    treeWalk.release
-    revWalk.dispose
 
     val commits = getLatestCommitFromPaths(git, list.toList.map(_._3), revision)
     list.map { case (objectId, fileMode, path, name) =>
@@ -237,7 +208,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
@@ -270,25 +242,23 @@ object JGitUtil {
         case _ => (logs, i.hasNext)
       }
     
-    val revWalk = new RevWalk(git.getRepository)
-    val objectId = git.getRepository.resolve(revision)
-    if(objectId == null){
-      Left(s"${revision} can't be resolved.")
-    } else {
-      revWalk.markStart(revWalk.parseCommit(objectId))
-      if(path.nonEmpty){
-        revWalk.setRevFilter(new RevFilter(){
-          def include(walk: RevWalk, commit: RevCommit): Boolean = {
-            getDiffs(git, commit.getName, false)._1.find(_.newPath == path).nonEmpty
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      defining(git.getRepository.resolve(revision)){ objectId =>
+        if(objectId == null){
+          Left(s"${revision} can't be resolved.")
+        } else {
+          revWalk.markStart(revWalk.parseCommit(objectId))
+          if(path.nonEmpty){
+            revWalk.setRevFilter(new RevFilter(){
+              def include(walk: RevWalk, commit: RevCommit): Boolean = {
+                getDiffs(git, commit.getName, false)._1.find(_.newPath == path).nonEmpty
+              }
+              override def clone(): RevFilter = this
+            })
           }
-          override def clone(): RevFilter = this
-        })
+          Right(getCommitLog(revWalk.iterator, 0, Nil))
+        }
       }
-
-      val commits = getCommitLog(revWalk.iterator, 0, Nil)
-      revWalk.release
-
-      Right(commits)
     }
   }
 
@@ -308,13 +278,10 @@ object JGitUtil {
         case false => logs
       }
 
-    val revWalk = new RevWalk(git.getRepository)
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(begin)))
-
-    val commits = getCommitLog(revWalk.iterator, Nil)
-    revWalk.release
-
-    commits.reverse
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(begin)))
+      getCommitLog(revWalk.iterator, Nil).reverse
+    }
   }
 
   
@@ -370,11 +337,8 @@ object JGitUtil {
     if(large == false && FileUtil.isLarge(loader.getSize)){
       None
     } else {
-      val db = git.getRepository.getObjectDatabase
-      try {
+      using(git.getRepository.getObjectDatabase){ db =>
         Some(db.open(id).getBytes)
-      } finally {
-        db.close
       }
     }
   } catch {
@@ -392,34 +356,32 @@ object JGitUtil {
         case _ => logs
       }
 
-    val revWalk = new RevWalk(git.getRepository)
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(id)))
-    
-    val commits = getCommitLog(revWalk.iterator, Nil)
-    revWalk.release
-    
-    val revCommit = commits(0)
-    
-    if(commits.length >= 2){
-      // not initial commit
-      val oldCommit = commits(1)
-      (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(id)))
+      val commits   = getCommitLog(revWalk.iterator, Nil)
+      val revCommit = commits(0)
 
-    } else {
-      // initial commit
-      val walk = new TreeWalk(git.getRepository)
-      walk.addTree(revCommit.getTree)
-      val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]()
-      while(walk.next){
-        buffer.append((if(!fetchContent){
-          DiffInfo(ChangeType.ADD, null, walk.getPathString, None, None)
-        } else {
-          DiffInfo(ChangeType.ADD, null, walk.getPathString, None, 
-              JGitUtil.getContent(git, walk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray))
-        }))
+      if(commits.length >= 2){
+        // not initial commit
+        val oldCommit = commits(1)
+        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))
+
+      } else {
+        // initial commit
+        using(new TreeWalk(git.getRepository)){ treeWalk =>
+          treeWalk.addTree(revCommit.getTree)
+          val buffer = new scala.collection.mutable.ListBuffer[DiffInfo]()
+          while(treeWalk.next){
+            buffer.append((if(!fetchContent){
+              DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None, None)
+            } else {
+              DiffInfo(ChangeType.ADD, null, treeWalk.getPathString, None,
+                JGitUtil.getContent(git, treeWalk.getObjectId(0), false).filter(FileUtil.isText).map(convertFromByteArray))
+            }))
+          }
+          (buffer.toList, None)
+        }
       }
-      walk.release
-      (buffer.toList, None)
     }
   }
 
@@ -447,75 +409,58 @@ object JGitUtil {
   /**
    * Returns the list of branch names of the specified commit.
    */
-  def getBranchesOfCommit(git: Git, commitId: String): List[String] = {
-    val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
-    try {
-      val commit = walk.parseCommit(git.getRepository.resolve(commitId + "^0"))
-
-      git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
-        (e.getKey.startsWith(Constants.R_HEADS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
-      }.map { e =>
-        e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
-      }.toList.sorted
-
-    } finally {
-      walk.release
+  def getBranchesOfCommit(git: Git, commitId: String): List[String] =
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))){ commit =>
+        git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
+          (e.getKey.startsWith(Constants.R_HEADS) && revWalk.isMergedInto(commit, revWalk.parseCommit(e.getValue.getObjectId)))
+        }.map { e =>
+          e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_HEADS.length)
+        }.toList.sorted
+      }
     }
-  }
 
   /**
    * Returns the list of tags of the specified commit.
    */
-  def getTagsOfCommit(git: Git, commitId: String): List[String] = {
-    val walk = new org.eclipse.jgit.revwalk.RevWalk(git.getRepository)
-    try {
-      val commit = walk.parseCommit(git.getRepository.resolve(commitId + "^0"))
-
-      git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
-        (e.getKey.startsWith(Constants.R_TAGS) && walk.isMergedInto(commit, walk.parseCommit(e.getValue.getObjectId)))
-      }.map { e =>
-        e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
-      }.toList.sorted.reverse
-
-    } finally {
-      walk.release
+  def getTagsOfCommit(git: Git, commitId: String): List[String] =
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      defining(revWalk.parseCommit(git.getRepository.resolve(commitId + "^0"))){ commit =>
+        git.getRepository.getAllRefs.entrySet.asScala.filter { e =>
+          (e.getKey.startsWith(Constants.R_TAGS) && revWalk.isMergedInto(commit, revWalk.parseCommit(e.getValue.getObjectId)))
+        }.map { e =>
+          e.getValue.getName.substring(org.eclipse.jgit.lib.Constants.R_TAGS.length)
+        }.toList.sorted.reverse
+      }
     }
-  }
 
-  def initRepository(dir: java.io.File): Unit = {
-    val repository = new RepositoryBuilder().setGitDir(dir).setBare.build
-    try {
+  def initRepository(dir: java.io.File): Unit =
+    using(new RepositoryBuilder().setGitDir(dir).setBare.build){ repository =>
       repository.create
       setReceivePack(repository)
-    } finally {
-      repository.close
     }
-  }
 
-  def cloneRepository(from: java.io.File, to: java.io.File): Unit = {
-    val git = Git.cloneRepository.setURI(from.toURI.toString).setDirectory(to).setBare(true).call
-    try {
+  def cloneRepository(from: java.io.File, to: java.io.File): Unit =
+    using(Git.cloneRepository.setURI(from.toURI.toString).setDirectory(to).setBare(true).call){ git =>
       setReceivePack(git.getRepository)
-    } finally {
-      git.getRepository.close
     }
-  }
 
   def isEmpty(git: Git): Boolean = git.getRepository.resolve(Constants.HEAD) == null
 
-  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit = {
-    val config = repository.getConfig
-    config.setBoolean("http", null, "receivepack", true)
-    config.save
-  }
+  private def setReceivePack(repository: org.eclipse.jgit.lib.Repository): Unit =
+    defining(repository.getConfig){ config =>
+      config.setBoolean("http", null, "receivepack", true)
+      config.save
+    }
 
   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)
   }
 

src/main/scala/util/Keys.scala

@@ -0,0 +1,72 @@
+package util
+
+/**
+ * Define key strings for request attributes, session attributes or flash attributes.
+ */
+object Keys {
+
+  /**
+   * Define session keys.
+   */
+  object Session {
+
+    /**
+     * Session key for the logged in account information.
+     */
+    val LoginAccount = "LOGIN_ACCOUNT"
+
+    /**
+     * Session key for the redirect URL.
+     */
+    val Redirect = "REDIRECT"
+
+    /**
+     * Session key for the issue search condition in dashboard.
+     */
+    val DashboardIssues = "dashboard/issues"
+
+    /**
+     * Session key for the pull request search condition in dashboard.
+     */
+    val DashboardPulls = "dashboard/pulls"
+
+    /**
+     * Generate session key for the issue search condition.
+     */
+    def Issues(owner: String, name: String) = s"${owner}/${name}/issues"
+
+    /**
+     * Generate session key for the pull request search condition.
+     */
+    def Pulls(owner: String, name: String) = s"${owner}/${name}/pulls"
+
+    /**
+     * Generate session key for the upload filename.
+     */
+    def Upload(fileId: String) = s"upload_${fileId}"
+
+  }
+
+  /**
+   * Define request keys.
+   */
+  object Request {
+
+    /**
+     * Request key for the Ajax request flag.
+     */
+    val Ajax = "AJAX"
+
+    /**
+     * Request key for the username which is used during Git repository access.
+     */
+    val UserName = "USER_NAME"
+
+    /**
+     * Generate request key for the request cache.
+     */
+    def Cache(key: String) = s"cache.${key}"
+
+  }
+
+}

src/main/scala/util/LDAPUtil.scala

@@ -1,10 +1,9 @@
 package util
 
-import service.SystemSettingsService.Ldap
+import util.ControlUtil._
 import service.SystemSettingsService
 import com.novell.ldap._
 import service.SystemSettingsService.Ldap
-import scala.Some
 import scala.annotation.tailrec
 
 /**
@@ -29,7 +28,7 @@ object LDAPUtil {
         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.")
           }
         }
       }
@@ -96,12 +95,10 @@ object LDAPUtil {
     }
   }
 
-  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] = {
-    val results = conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)
-    if (results.hasMore) {
-      Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
-    } else {
-      None
+  private def findMailAddress(conn: LDAPConnection, userDN: String, mailAttribute: String): Option[String] =
+    defining(conn.search(userDN, LDAPConnection.SCOPE_BASE, null, Array[String](mailAttribute), false)){ results =>
+      optionIf (results.hasMore) {
+        Option(results.next.getAttribute(mailAttribute)).map(_.getStringValue)
+      }
     }
-  }
 }

src/main/scala/util/LockUtil.scala

@@ -2,6 +2,7 @@ package util
 
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.locks.{ReentrantLock, Lock}
+import util.ControlUtil._
 
 object LockUtil {
 
@@ -23,8 +24,7 @@ object LockUtil {
   /**
    * Synchronizes a given function which modifies the working copy of the wiki repository.
    */
-  def lock[T](key: String)(f: => T): T = {
-    val lock = getLockObject(key)
+  def lock[T](key: String)(f: => T): T = defining(getLockObject(key)){ lock =>
     try {
       lock.lock()
       f

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)
@@ -65,26 +66,36 @@ class Mailer(private val smtp: Smtp) extends Notifier {
 
   def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
       (msg: String => String)(implicit context: Context) = {
-    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)))
+    val database = Database(context.request.getServletContext)
 
+    val f = future {
       // TODO Can we use the Database Session in other than Transaction Filter?
-      Database(context.request.getServletContext) withSession {
+      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.setSubject(subject)
+              email.setHtmlMsg(msg)
+
+              email.addTo(to).send
+            }
           }
         }
       }

src/main/scala/util/StringUtil.scala

@@ -2,14 +2,15 @@ package util
 
 import java.net.{URLDecoder, URLEncoder}
 import org.mozilla.universalchardet.UniversalDetector
+import util.ControlUtil._
 
 object StringUtil {
 
-  def sha1(value: String): String = {
-    val md = java.security.MessageDigest.getInstance("SHA-1")
-    md.update(value.getBytes)
-    md.digest.map(b => "%02x".format(b)).mkString
-  }
+  def sha1(value: String): String =
+    defining(java.security.MessageDigest.getInstance("SHA-1")){ md =>
+      md.update(value.getBytes)
+      md.digest.map(b => "%02x".format(b)).mkString
+    }
 
   def md5(value: String): String = {
     val md = java.security.MessageDigest.getInstance("MD5")
@@ -28,13 +29,13 @@ object StringUtil {
 
   def convertFromByteArray(content: Array[Byte]): String = new String(content, detectEncoding(content))
 
-  def detectEncoding(content: Array[Byte]): String = {
-    val detector = new UniversalDetector(null)
-    detector.handleData(content, 0, content.length)
-    detector.dataEnd()
-    detector.getDetectedCharset match {
-      case null => "UTF-8"
-      case e    => e
+  def detectEncoding(content: Array[Byte]): String =
+    defining(new UniversalDetector(null)){ detector =>
+      detector.handleData(content, 0, content.length)
+      detector.dataEnd()
+      detector.getDetectedCharset match {
+        case null => "UTF-8"
+        case e    => e
+      }
     }
-  }
 }

src/main/scala/util/Validations.scala

@@ -9,7 +9,7 @@ trait Validations {
    */
   def identifier: Constraint = new Constraint(){
     override def validate(name: String, value: String): Option[String] =
-      if(!value.matches("^[a-zA-Z0-9\\-_]+$")){
+      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,10 +25,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 = {
-        val formatter = new java.text.SimpleDateFormat("yyyy-MM-dd")
-        formatter.parse(value)
-      }
+      def convert(value: String): 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"""http://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"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/${account.userName}/_avatar"""
+        }
+      } getOrElse {
+        if(getSystemSettings().gravatar){
+          s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
+        } else {
+          s"""${context.path}/_unknown/_avatar"""
+        }
       }
     }
 

src/main/scala/view/LinkConverter.scala

@@ -15,10 +15,12 @@ trait LinkConverter { self: RequestCache =>
       .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)}""")
+        getIssue(repository.owner, repository.name, m.group(2)) match {
+          case Some(issue) if(issue.isPullRequest)
+                       => Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+          case Some(_) => Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+          case None    => Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+
         }
       }
       // convert @username to link

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 {
 
@@ -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
       }
@@ -52,7 +60,7 @@ class GitBucketLinkRender(context: app.Context, repository: service.RepositorySe
 }
 
 class GitBucketVerbatimSerializer extends VerbatimSerializer {
-  def serialize(node: VerbatimNode, printer: Printer) {
+  def serialize(node: VerbatimNode, printer: Printer): Unit = {
     printer.println.print("<pre")
     if (!StringUtils.isEmpty(node.getType)) {
       printer.print(" class=").print('"').print("prettyprint ").print(node.getType).print('"')
@@ -98,11 +106,11 @@ class GitBucketHtmlSerializer(
     }
   }
 
-  private def printAttribute(name: String, value: String) {
+  private def printAttribute(name: String, value: String): Unit = {
     printer.print(' ').print(name).print('=').print('"').print(value).print('"')
   }
 
-  override def visit(node: TextNode) {
+  override def visit(node: TextNode): Unit =  {
     // convert commit id and username to link.
     val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText
 

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".
    */
@@ -31,9 +31,8 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    * Converts Markdown of Wiki pages to HTML.
    */
   def markdown(value: String, repository: service.RepositoryService.RepositoryInfo,
-               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
+               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html =
     Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
-  }
 
   /**
    * Returns <img> which displays the avatar icon.
@@ -58,16 +57,29 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
       value
     }
 
+  import scala.util.matching.Regex
+  import scala.util.matching.Regex._
+  implicit class RegexReplaceString(s: String) {
+    def replaceAll(pattern: String, replacer: (Match) => String): String = {
+      pattern.r.replaceAllIn(s, replacer)
+    }
+  }
+
   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("\\[branch:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]", (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/tree/${encodeRefName(m.group(3))}">${m.group(3)}</a>""")
+      .replaceAll("\\[tag:([^\\s]+?)/([^\\s]+?)#([^\\s]+?)\\]"   , (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/tree/${encodeRefName(m.group(3))}">${m.group(3)}</a>""")
       .replaceAll("\\[user:([^\\s]+?)\\]"                        , s"""<a href="${context.path}/$$1">$$1</a>""")
     )
 
+  /**
+   * 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("")
@@ -81,14 +93,21 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   /**
    * Generates the url to the account page.
    */
-  def url(userName: String)(implicit context: app.Context): String =
-    s"${context.path}/${userName}"
+  def url(userName: String)(implicit context: app.Context): String = s"${context.path}/${userName}"
 
   /**
    * Returns the url to the root of assets.
    */
-  def assets(implicit context: app.Context): String =
-    s"${context.path}/assets"
+  def assets(implicit context: app.Context): String = s"${context.path}/assets"
+
+  /**
+   * Generates the link to the account page.
+   */
+  def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
+    getAccountByMailAddress(mailAddress).map { account =>
+      Html(s"""<a href="${url(account.userName)}" class="${styleClass}">${userName}</a>""")
+    } getOrElse Html(userName)
+  }
 
   def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime
 

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

@@ -13,36 +13,43 @@
       <div class="span6">
         @if(account.isEmpty){
           <fieldset>
-            <label for="userName"><strong>User name</strong></label>
+            <label for="userName" class="strong">Username:</label>
             <input type="text" name="userName" id="userName" value=""/>
             <span id="error-userName" class="error"></span>
           </fieldset>
         }
         @if(account.map(_.password.nonEmpty).getOrElse(true)){
           <fieldset>
-            <label for="password"><strong>Password</strong>
+            <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"><strong>Mail Address</strong></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"><strong>URL (Optional)</strong></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"><strong>Image (Optional)</strong></label>
+          <label for="avatar" class="strong">Image (optional):</label>
           @helper.html.uploadavatar(account)
         </fieldset>
       </div>

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

@@ -11,35 +11,35 @@
           <!--====================================================================-->
           <!-- Account registration -->
           <!--====================================================================-->
-          <label><strong>Account registration</strong></label>
+          <label class="strong">Account registration</label>
           <fieldset>
-            <label>
+            <label class="radio">
               <input type="radio" name="allowAccountRegistration" value="true"@if(settings.allowAccountRegistration){ checked}>
-              <strong>Allow</strong> - 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}>
-              <strong>Deny</strong> - Only administrators can create account.
+              <span class="strong">Deny</span> - Only administrators can create accounts.
             </label>
           </fieldset>
           <!--====================================================================-->
           <!-- Services -->
           <!--====================================================================-->
           <hr>
-          <label><strong>Services</strong></label>
+          <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>
           <!--====================================================================-->
           <!-- Authentication -->
           <!--====================================================================-->
           <hr>
-          <label><strong>Authentication</strong></label>
+          <label class="strong">Authentication</label>
           <fieldset>
-            <label>
+            <label class="checkbox">
               <input type="checkbox" id="ldapAuthentication" name="ldapAuthentication"@if(settings.ldap){ checked}/>
               LDAP
             </label>
@@ -99,9 +99,9 @@
           <!-- Notification email -->
           <!--====================================================================-->
           <hr>
-          <label><strong>Notification email</strong></label>
+          <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 +140,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

@@ -7,23 +7,27 @@
       <div class="row-fluid">
         <div class="span7">
           <fieldset>
-            <label for="groupName"><strong>Group name</strong></label>
-            <span id="error-groupName" class="error"></span>
+            <label for="groupName" class="strong">Group name</label>
+            <div>
+              <span id="error-groupName" class="error"></span>
+            </div>
             <input type="text" name="groupName" id="groupName" value="@account.map(_.userName)"@if(account.isDefined){ readonly}/>
           </fieldset>
           <fieldset>
-            <label><strong>URL (Optional)</strong></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: 300px;" value="@account.map(_.url)"/>
           </fieldset>
           <fieldset>
-            <label for="avatar"><strong>Image (Optional)</strong></label>
+            <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
         <div class="span5">
           <fieldset>
-            <label><strong>Members</strong></label>
+            <label class="strong">Members</label>
             <ul id="members" class="collaborator">
               @members.map { userName =>
                 <li data-name="@userName">
@@ -32,7 +36,7 @@
                 </li>
               }
             </ul>
-            <input type="text" id="memberName" style="width: 200px; margin-bottom: 0px;"/>
+            @helper.html.account("memberName", 200)
             <input type="button" class="btn" value="Add" id="addMember"/>
             <input type="hidden" id="memberNames" name="memberNames" value="@members.mkString(",")"/>
             <div>
@@ -50,15 +54,6 @@
 }
 <script>
 $(function(){
-  $('#memberName').typeahead({
-    source: function (query, process) {
-      return $.get('@path/_user/proposals', { query: query },
-        function (data) {
-          return process(data.options);
-        });
-    }
-  });
-
   $('#addMember').click(function(){
     $('#error-memberName').text('');
     var userName = $('#memberName').val();

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

@@ -6,45 +6,61 @@
       <div class="row-fluid">
         <div class="span6">
           <fieldset>
-            <label for="userName"><strong>Username</strong></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}/>
           </fieldset>
           @if(account.map(_.password.nonEmpty).getOrElse(true)){
             <fieldset>
-              <label for="password">
-                <strong>Password</strong>
+              <label for="password" class="strong">
+                Password
                 @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"><strong>Mail Address</strong></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><strong>User Type</strong></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><strong>URL (Optional)</strong></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>
         <div class="span6">
           <fieldset>
-            <label for="avatar"><strong>Image (Optional)</strong></label>
+            <label for="avatar" class="strong">Image (Optional)</label>
             @helper.html.uploadavatar(account)
           </fieldset>
         </div>
@@ -55,4 +71,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">
@@ -48,10 +55,8 @@
       <a href="@url(repository)/settings">Settings</a>
     </th>
     }
-  </tr>  
+  </tr>
 </table>
-<form method="POST" id="repository_form">
-</form>
 <script type="text/javascript">
 $(function(){
   $('table.global-nav th.box-header').click(function(){

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

@@ -0,0 +1,15 @@
+@(id: String, width: Int)(implicit context: app.Context)
+@import context._
+<input type="text" name="@id" id="@id" style="width: @{width}px; margin-bottom: 0px;"/>
+<script>
+$(function(){
+  $('#@id').typeahead({
+    source: function (query, process) {
+      return $.get('@path/_user/proposals', { query: query },
+        function (data) {
+          return process(data.options);
+        });
+    }
+  });
+});
+</script>

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">
@@ -24,10 +26,12 @@
               if(i == 3){
                 <div>...</div>
               } else {
-                <div>
-                   <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
-                    <span>{commit.substring(41)}</span>
-                </div>
+                if(commit.nonEmpty){
+                  <div>
+                     <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit. substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
+                     <span>{commit.substring(41)}</span>
+                  </div>
+                }
               }
             }}
           </div>

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

@@ -1,10 +1,39 @@
 @(diffs: Seq[util.JGitUtil.DiffInfo],
  repository: service.RepositoryService.RepositoryInfo,
  newCommitId: Option[String],
- oldCommitId: Option[String])(implicit context: app.Context)
+ oldCommitId: Option[String],
+ showIndex: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
+@if(showIndex){
+  <div>
+    <div class="pull-right" style="margin-bottom: 10px;">
+      <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
+    </div>
+    Showing @diffs.size changed @plural(diffs.size, "file")
+  </div>
+  <ul id="commit-file-list" style="display: none;">
+  @diffs.zipWithIndex.map { case (diff, i) =>
+    <li@if(i > 0){ class="border"}>
+      <a href="#diff-@i">
+        @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
+          <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.ADD){
+          <img src="@assets/common/images/diff_add.png"/> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.MODIFY){
+          <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
+        }
+        @if(diff.changeType == ChangeType.DELETE){
+          <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
+        }
+      </a>
+    </li>
+    }
+  </ul>
+}
 @diffs.zipWithIndex.map { case (diff, i) =>
   <a name="diff-@i"></a>
   <table class="table table-bordered">
@@ -103,6 +132,17 @@ function diffUsingJS(oldTextId, newTextId, outputId) {
 }
 
 $(function(){
+  @if(showIndex){
+    $('#toggle-file-list').click(function(){
+      $('#commit-file-list').toggle();
+      if($(this).val() == 'Show file list'){
+        $(this).val('Hide file list');
+      } else {
+        $(this).val('Show file list');
+      }
+    });
+  }
+
   @diffs.zipWithIndex.map { case (diff, i) =>
     @if(diff.newContent != None || diff.oldContent != None){
       if($('#oldText-@i').length > 0){

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

@@ -1,13 +1,13 @@
-@(buttonValue: String = "", prefix: String = "")(body: Html)
-<div class="btn-group">
-  <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">
-    @if(buttonValue.isEmpty){
+@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "")(body: Html)
+<div class="btn-group"@if(style.nonEmpty){ style="@style"}>
+  <button class="btn dropdown-toggle@if(mini){ btn-mini}" data-toggle="dropdown">
+    @if(value.isEmpty){
       <i class="icon-cog"></i>
     } else {
       @if(prefix.nonEmpty){
         <span class="muted">@prefix:</span>
       }
-      <strong>@buttonValue</strong>
+      <span class="strong">@value</span>
     }
     <span class="caret"></span>
   </button>

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,10 +31,16 @@
           @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)"><strong>@repository.name</strong></a>
+                  <a href="@url(repository)"><span class="strong">@repository.name</span></a>
                 } else {
-                  <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
+                  <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
                 }
               </td>
             </tr>
@@ -57,7 +63,13 @@
         @recentRepositories.map { repository =>
           <tr>
             <td>
-              <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
+              @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

@@ -15,12 +15,20 @@
         <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>
   }
@@ -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">
@@ -65,7 +65,7 @@
     </div>
     <div class="span3">
       @if(hasWritePermission){
-        <strong>Add Labels</strong>
+        <span class="strong">Add Labels</span>
         <div>
           <div id="label-list">
             <ul class="label-list nav nav-pills nav-stacked">
@@ -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);
@@ -111,7 +111,7 @@ $(function(){
     if(milestoneId == ''){
       $('#label-milestone').text('No milestone');
     } else {
-      $('#label-milestone').html($('<span>').append('Milestone: ').append($('<strong>').text(title)));
+      $('#label-milestone').html($('<span>').append('Milestone: ').append($('<span class="strong">').text(title)));
       $('a.milestone[data-id=' + milestoneId + '] i').attr('class', 'icon-ok');
     }
     $('input[name=milestoneId]').val(milestoneId);

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/issue.scala.html

@@ -29,19 +29,19 @@
       }
       <div class="small" style="text-align: center;">
         @defining(comments.filter( _.action.contains("comment") ).size){ count =>
-          <strong>@count</strong> @plural(count, "comment")
+          <span class="strong">@count</span> @plural(count, "comment")
         }
       </div>
       <hr/>
       <div style="margin-bottom: 8px;">
-      <strong>Labels</strong>
+      <span class="strong">Labels</span>
       @if(hasWritePermission){
         <div class="pull-right">
           @helper.html.dropdown() {
             @labels.map { label =>
               <li>
                 <a href="#" class="toggle-label" data-label-id="@label.labelId">
-                  <i class="@{if(issueLabels.exists(_.labelId == label.labelId)) "icon-ok" else "icon-white"}"></i>
+                  @helper.html.checkicon(issueLabels.exists(_.labelId == label.labelId))
                   <span class="label" style="background-color: #@label.color;">&nbsp;</span>
                   @label.labelName
                 </a>

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

@@ -28,7 +28,11 @@
         @helper.html.dropdown() {
           <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
           @collaborators.map { collaborator =>
-            <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-white"></i>@avatar(collaborator, 20) @collaborator</a></li>
+            <li>
+              <a href="javascript:void(0);" class="assign" data-name="@collaborator">
+                @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator
+              </a>
+            </li>
           }
         }
       }
@@ -36,7 +40,7 @@
         <span id="label-milestone">
           @issue.milestoneId.map { milestoneId =>
             @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) =>
-              Milestone: <strong>@milestone.title</strong>
+              Milestone: <span class="strong">@milestone.title</span>
             }
           }.getOrElse("No milestone")
         </span>
@@ -53,7 +57,7 @@
             @milestones.map { case (milestone, _, _) =>
               <li>
                 <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
-                  <i class="icon-white"></i> @milestone.title
+                  @helper.html.checkicon(Some(milestone.milestoneId) == issue.milestoneId) @milestone.title
                   <div class="small" style="padding-left: 20px;">
                     @milestone.dueDate.map { dueDate =>
                       @if(isPast(dueDate)){
@@ -79,19 +83,12 @@
 </div>
 <div class="issue-participants">
   @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
-    <strong>@participants.size</strong> @plural(participants.size, "participant")
+    <span class="strong">@participants.size</span> @plural(participants.size, "participant")
     @participants.map { participant => <a href="@url(participant)">@avatar(participant, 20, tooltip = true)</a> }
   }
 </div>
 <script>
 $(function(){
-  @if(issue.assignedUserName.isDefined){
-    $('a.assign[data-name=@issue.assignedUserName] i').attr('class', 'icon-ok');
-  }
-  @if(issue.milestoneId.isDefined){
-    $('a.milestone[data-id=@issue.milestoneId] i').attr('class', 'icon-ok');
-  }
-
   $('#edit').click(function(){
     $.get('@url(repository)/issues/_data/@issue.issueId',
     {
@@ -138,7 +135,7 @@ $(function(){
         $('#label-milestone').text('No milestone');
         $('#milestone-progress-area').empty();
       } else {
-        $('#label-milestone').html($('<span>').append('Milestone: ').append($('<strong>').text(title)));
+        $('#label-milestone').html($('<span>').append('Milestone: ').append($('<span class="strong">').text(title)));
         $('#milestone-progress-area').html(data);
         $('a.milestone[data-id=' + milestoneId + '] i').attr('class', 'icon-ok');
       }

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

@@ -106,7 +106,7 @@
         }
       }
       <hr/>
-      <strong>Labels</strong>
+      <span class="strong">Labels</span>
       <div>
         <div id="label-list">
           <ul class="label-list nav nav-pills nav-stacked">
@@ -127,7 +127,7 @@
         <hr/>
         <input type="button" class="btn btn-block" id="manageLabel" data-toggle="button" value="Manage Labels"/>
         <br/>
-        <strong>New label</strong>
+        <span class="strong">New label</span>
         @_root_.issues.labels.html.edit(None, repository)
       }
     </div>

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

@@ -29,52 +29,49 @@
         <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
         <a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
       </div>
-      <div class="btn-group">
-        <button class="btn dropdown-toggle" data-toggle="dropdown">
-          Sort:
-          <strong>
-            @if(condition.sort == "created"  && condition.direction == "desc"){ Newest }
-            @if(condition.sort == "created"  && condition.direction == "asc" ){ Oldest }
-            @if(condition.sort == "comments" && condition.direction == "desc"){ Most commented }
-            @if(condition.sort == "comments" && condition.direction == "asc" ){ Least commented }
-            @if(condition.sort == "updated"  && condition.direction == "desc"){ Recently updated }
-            @if(condition.sort == "updated"  && condition.direction == "asc" ){ Least recently updated }
-          </strong>
-          <span class="caret"></span>
-        </button>
-        <ul class="dropdown-menu">
-          <li>
-            <a href="@condition.copy(sort="created",  direction="desc").toURL">
-              @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
-              @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="comments", direction="desc").toURL">
-              @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
-              @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="updated",  direction="desc").toURL">
-              @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
-            </a>
-          </li>
-          <li>
-            <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
-              @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
-            </a>
-          </li>
-        </ul>
-      </div>
+      @helper.html.dropdown(
+        value  = (condition.sort, condition.direction) match {
+          case ("created" , "desc") => "Newest"
+          case ("created" , "asc" ) => "Oldest"
+          case ("comments", "desc") => "Most commented"
+          case ("comments", "asc" ) => "Least commented"
+          case ("updated" , "desc") => "Recently updated"
+          case ("updated" , "asc" ) => "Least recently updated"
+        },
+        prefix = "Sort",
+        mini   = false
+      ){
+        <li>
+          <a href="@condition.copy(sort="created",  direction="desc").toURL">
+            @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
+            @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="comments", direction="desc").toURL">
+            @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
+            @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="updated",  direction="desc").toURL">
+            @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
+          </a>
+        </li>
+        <li>
+          <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
+            @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
+          </a>
+        </li>
+      }
       <table class="table table-bordered table-hover table-issues">
       @if(issues.isEmpty){
         <tr>
@@ -94,7 +91,7 @@
         <tr>
           <td style="background-color: #eee;">
             <div class="btn-group">
-              <button class="btn btn-mini" id="state"><strong>@{if(condition.state == "open") "Close" else "Reopen"}</strong></button>
+              <button class="btn btn-mini strong" id="state">@{if(condition.state == "open") "Close" else "Reopen"}</button>
             </div>
             @helper.html.dropdown("Label") {
               @labels.map { label =>

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

@@ -11,12 +11,12 @@
       <span id="error-title" class="error"></span>
     </fieldset>
     <fieldset>
-      <label for="description"><strong>Description</strong></label>
+      <label for="description" class="strong">Description</label>
       <textarea id="description" name="description" style="width: 500px; height: 150px;">@milestone.map(_.description)</textarea>
       <span id="error-description" class="error"></span>
     </fieldset>
     <fieldset>
-      <label for="dueDate"><strong>Due Date</strong></label>
+      <label for="dueDate" class="strong">Due Date</label>
       @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
       <span id="error-dueDate" class="error"></span>
     </fieldset>

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,10 +5,10 @@
 <div style="width: 600px; margin: 10px auto;">
   <form id="form" method="post" action="@path/new" validate="true">
     <fieldset>
-      <label for="name"><strong>Repository name</strong></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">
-          <strong>@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</strong>
+          <span class="strong">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</span>
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu">
@@ -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"><strong>Description</strong> (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>
-        <strong>Public</strong><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">
-        <strong>Private</strong><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"/>
-        <strong>Initialize this repository with a README</strong>
+        <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>
@@ -68,6 +68,6 @@ $('#owner-dropdown a').click(function(){
   $('#owner-dropdown i').attr('class', 'icon-white');
   $(this).find('i').attr('class', 'icon-ok');
 
-  $('#owner-dropdown strong').html($(this).find('span').html());
+  $('#owner-dropdown span.strong').html($(this).find('span').html());
 });
 </script>

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

@@ -1,7 +1,4 @@
-@(issue: model.Issue,
-  pullreq: model.PullRequest,
-  commits: Seq[Seq[util.JGitUtil.CommitInfo]],
-  hasWritePermission: Boolean,
+@(commits: Seq[Seq[util.JGitUtil.CommitInfo]],
   repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
@@ -14,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

@@ -5,15 +5,13 @@
   forkedId: String,
   sourceId: String,
   commitId: String,
-  hasConflict: Boolean,
   repository: service.RepositoryService.RepositoryInfo,
   originRepository: service.RepositoryService.RepositoryInfo,
   forkedRepository: service.RepositoryService.RepositoryInfo,
   hasWritePermission: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-@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">
@@ -29,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>
         }
       }
       ...
@@ -40,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>
@@ -53,14 +51,9 @@
         <div class="box-content">
           <form method="POST" action="@path/@originRepository.owner/@repository.name/pulls/new" validate="true">
             <div style="width: 260px; position: absolute; margin-left: 635px;">
-              @if(hasConflict){
-                <h4>We can’t automatically merge these branches</h4>
-                <p>Don't worry, you can still submit the pull request.</p>
-              } else {
-                <h4 style="color: #468847;">Able to merge</h4>
-                <p>These branches can be automatically merged.</p>
-              }
-              <input type="submit" class="btn btn-success btn-block" value="Send pull request"/>
+              <div class="check-conflict" style="display: none;">
+                <img src="@assets/common/images/indicator.gif"/> Checking...
+              </div>
             </div>
             <div style="width: 620px; border-right: 1px solid #d4d4d4;">
               <span class="error" id="error-title"></span>
@@ -82,59 +75,13 @@
       <tr>
         <td style="padding: 20px; background-color: #eee; text-align: center;">
           <h4>There isn't anything to compare.</h4>
-          <strong>@originRepository.owner:@originId</strong> and <strong>@forkedRepository.owner:@forkedId</strong> are identical.
+          <span class="strong">@originRepository.owner:@originId</span> and <span class="strong">@forkedRepository.owner:@forkedId</span> are identical.
         </td>
       </tr>
     </table>
   } else {
-    <div class="box">
-      <table class="table table-file-list" style="border: 1px solid silver;">
-        @commits.map { day =>
-          <tr>
-            <th colspan="3" class="box-header" style="font-weight: normal;">@date(day.head.time)</th>
-          </tr>
-          @day.map { commit =>
-            <tr>
-              <td style="width: 20%;">
-                @avatar(commit.committer, 20)
-                <a href="@url(commit.committer)" class="username">@commit.committer</a>
-              </td>
-              <td>@commit.shortMessage</td>
-              <td style="width: 10%; text-align: right;">
-                <a href="@url(repository)/commit/@commit.id" class="monospace">@commit.id.substring(0, 7)</a>
-              </td>
-            </tr>
-          }
-        }
-      </table>
-    </div>
-    <div>
-      <div class="pull-right" style="margin-bottom: 10px;">
-        <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
-      </div>
-      Showing @diffs.size changed @plural(diffs.size, "file")
-    </div>
-    <ul id="commit-file-list" style="display: none;">
-    @diffs.zipWithIndex.map { case (diff, i) =>
-      <li@if(i > 0){ class="border"}>
-        <a href="#diff-@i">
-          @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-            <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
-          }
-          @if(diff.changeType == ChangeType.ADD){
-            <img src="@assets/common/images/diff_add.png"/> @diff.newPath
-          }
-          @if(diff.changeType == ChangeType.MODIFY){
-            <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
-          }
-          @if(diff.changeType == ChangeType.DELETE){
-            <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
-          }
-        </a>
-      </li>
-      }
-    </ul>
-    @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId))
+    @pulls.html.commits(commits, repository)
+    @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true)
   }
 }
 <script>
@@ -153,7 +100,7 @@ $(function(){
     var e = $(this);
     e.parents('ul').find('i').attr('class', 'icon-white');
     e.find('i').attr('class', 'icon-ok');
-    e.parents('div.btn-group').find('button strong').text(e.text());
+    e.parents('div.btn-group').find('button span.strong').text(e.text());
 
     @if(members.isEmpty){
       location.href = '@url(repository)/compare/' +
@@ -173,13 +120,26 @@ $(function(){
     $('#pull-request-form').show();
   });
 
-  $('#toggle-file-list').click(function(){
-    $('#commit-file-list').toggle();
-    if($(this).val() == 'Show file list'){
-      $(this).val('Hide file list');
-    } else {
-      $(this).val('Show file list');
+  @if(hasWritePermission){
+    function checkConflict(from, to, noConflictHandler, hasConflictHandler){
+      $('.check-conflict').show();
+      $.get('@url(repository)/compare/' + from + '...' + to + '/mergecheck',
+        function(data){ $('.check-conflict').html(data); });
     }
-  });
+
+    @if(members.isEmpty){
+      checkConflict(
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')),
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'))
+      );
+    } else {
+      checkConflict(
+        $.trim($('i.icon-ok').parents('a.origin-owner' ).data('name')) + ":" +
+        $.trim($('i.icon-ok').parents('a.origin-branch').data('name')),
+        $.trim($('i.icon-ok').parents('a.forked-owner' ).data('name')) + ":" +
+        $.trim($('i.icon-ok').parents('a.forked-branch').data('name'))
+      );
+    }
+  }
 });
 </script>

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

@@ -3,10 +3,8 @@
   comments: List[model.IssueComment],
   collaborators: List[String],
   milestones: List[(model.Milestone, Int, Int)],
-  hasConflict: Boolean,
   hasWritePermission: Boolean,
-  repository: service.RepositoryService.RepositoryInfo,
-  requestRepositoryUrl: String)(implicit context: app.Context)
+  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <div class="row-fluid">
@@ -17,77 +15,14 @@
       <div class="box issue-comment-box" style="background-color: #d8f5cd;">
         <div class="box-content"class="issue-content" style="border: 1px solid #95c97e; padding: 10px;">
           <div id="merge-pull-request">
-            <div class="pull-right">
-              <input type="button" class="btn btn-success" id="merge-pull-request-button" value="Merge pull request"@if(hasConflict){ disabled="true"}/>
-            </div>
-            <div>
-              @if(hasConflict){
-                <strong>We can’t automatically merge this pull request.</strong>
-              } else {
-                <strong>This pull request can be automatically merged.</strong>
-              }
-            </div>
-            <div class="small">
-              @if(hasConflict){
-                <a href="#" id="show-command-line">Use the command line</a> to resolve conflicts before continuing.
-              } else {
-                You can also merge branches on the <a href="#" id="show-command-line">command line</a>.
-              }
-            </div>
-            <div id="command-line" style="display: none;">
-              <hr>
-              @if(hasConflict){
-                <strong>Checkout via command line</strong>
-                <p>
-                  If you cannot merge a pull request automatically here, you have the option of checking
-                  it out via command line to resolve conflicts and perform a manual merge.
-                </p>
-              } else {
-                <strong>Merging via command line</strong>
-                <p>
-                  If you do not want to use the merge button or an automatic merge cannot be performed,
-                  you can perform a manual merge on the command line.
-                </p>
-              }
-              @helper.html.copy("repository-url-copy", requestRepositoryUrl){
-                <input type="text" value="@requestRepositoryUrl" id="repository-url" readonly>
-              }
-              <div>
-                <p>
-                  <strong>Step 1:</strong> Check out a new branch to test the changes — run this from your project directory
-                </p>
-                @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.requestBranch}"){ command =>
-                  @helper.html.copy("merge-command-copy-1", command){
-                    <pre style="width: 500px; float: left;">@command</pre>
-                  }
-                }
-              </div>
-              <div>
-                <p>
-                  <strong>Step 2:</strong> Bring in @{pullreq.requestUserName}'s changes and test
-                </p>
-                @defining(s"git pull ${requestRepositoryUrl} ${pullreq.requestBranch}"){ command =>
-                  @helper.html.copy("merge-command-copy-2", command){
-                    <pre style="width: 500px; float: left;">@command</pre>
-                  }
-                }
-              </div>
-              <div>
-                <p>
-                  <strong>Step 3:</strong> Merge the changes and update the server
-                </p>
-                @defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.branch}\ngit push origin ${pullreq.branch}"){ command =>
-                  @helper.html.copy("merge-command-copy-3", command){
-                    <pre style="width: 500px; float: left;">@command</pre>
-                  }
-                }
-              </div>
+            <div class="check-conflict" style="display: none;">
+              <img src="@assets/common/images/indicator.gif"/> Checking...
             </div>
           </div>
           <div id="confirm-merge-form" style="display: none;">
             <form method="POST" action="@url(repository)/pull/@issue.issueId/merge">
-              <div>
-                <strong>Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}</strong>
+              <div class="strong">
+                Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
               </div>
               <span id="error-message" class="error"></span>
               <textarea name="message" style="width: 680px; height: 80px;">@issue.title</textarea>
@@ -113,26 +48,22 @@
       <span class="label label-success issue-status">Open</span>
     }
     <div class="small" style="text-align: center;">
-      <strong>@comments.size</strong> @plural(comments.size, "comment")
+      <span class="strong">@comments.size</span> @plural(comments.size, "comment")
     </div>
     <hr/>
   </div>
 </div>
 <script>
 $(function(){
-  $('#show-command-line').click(function(){
-    $('#command-line').show();
-    return false;
-  });
-
-  $('#merge-pull-request-button').click(function(){
-    $('#merge-pull-request').hide();
-    $('#confirm-merge-form').show();
-  });
-
   $('#cancel-merge-pull-request').click(function(){
     $('#confirm-merge-form').hide();
     $('#merge-pull-request').show();
   });
+
+  @if(hasWritePermission){
+    $('.check-conflict').show();
+    $.get('@url(repository)/pull/@issue.issueId/mergeguide',
+      function(data){ $('.check-conflict').html(data); });
+  }
 });
 </script>

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

@@ -1,49 +0,0 @@
-@(issue: model.Issue,
-  pullreq: model.PullRequest,
-  diffs: Seq[util.JGitUtil.DiffInfo],
-  newCommitId: String,
-  oldCommitId: String,
-  hasWritePermission: Boolean,
-  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-@import org.eclipse.jgit.diff.DiffEntry.ChangeType
-<div>
-  <div class="pull-right" style="margin-bottom: 10px;">
-    <input id="toggle-file-list" type="button" class="btn" value="Show file list"/>
-  </div>
-  Showing @diffs.size changed @plural(diffs.size, "file")
-</div>
-<ul id="commit-file-list" style="display: none;">
-@diffs.zipWithIndex.map { case (diff, i) =>
-  <li@if(i > 0){ class="border"}>
-    <a href="#diff-@i">
-      @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-        <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
-      }
-      @if(diff.changeType == ChangeType.ADD){
-        <img src="@assets/common/images/diff_add.png"/> @diff.newPath
-      }
-      @if(diff.changeType == ChangeType.MODIFY){
-        <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
-      }
-      @if(diff.changeType == ChangeType.DELETE){
-        <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
-      }
-    </a>
-  </li>
-}
-</ul>
-@helper.html.diff(diffs, repository, Some(newCommitId), Some(oldCommitId))
-<script>
-$(function(){
-  $('#toggle-file-list').click(function(){
-    $('#commit-file-list').toggle();
-    if($(this).val() == 'Show file list'){
-      $(this).val('Hide file list');
-    } else {
-      $(this).val('Show file list');
-    }
-  });
-});
-</script>

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

@@ -20,52 +20,49 @@
     <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
       <a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
   </div>
-  <div class="btn-group">
-    <button class="btn dropdown-toggle" data-toggle="dropdown">
-      Sort:
-      <strong>
-        @if(condition.sort == "created"  && condition.direction == "desc"){ Newest }
-        @if(condition.sort == "created"  && condition.direction == "asc" ){ Oldest }
-        @if(condition.sort == "comments" && condition.direction == "desc"){ Most commented }
-        @if(condition.sort == "comments" && condition.direction == "asc" ){ Least commented }
-        @if(condition.sort == "updated"  && condition.direction == "desc"){ Recently updated }
-        @if(condition.sort == "updated"  && condition.direction == "asc" ){ Least recently updated }
-      </strong>
-      <span class="caret"></span>
-    </button>
-    <ul class="dropdown-menu">
-      <li>
-        <a href="@condition.copy(sort="created",  direction="desc").toURL">
-          @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
-          @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="comments", direction="desc").toURL">
-          @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
-          @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="updated",  direction="desc").toURL">
-          @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
-        </a>
-      </li>
-      <li>
-        <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
-          @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
-        </a>
-      </li>
-    </ul>
-  </div>
+  @helper.html.dropdown(
+    value  = (condition.sort, condition.direction) match {
+      case ("created" , "desc") => "Newest"
+      case ("created" , "asc" ) => "Oldest"
+      case ("comments", "desc") => "Most commented"
+      case ("comments", "asc" ) => "Least commented"
+      case ("updated" , "desc") => "Recently updated"
+      case ("updated" , "asc" ) => "Least recently updated"
+    },
+    prefix = "Sort",
+    mini   = false
+  ){
+    <li>
+      <a href="@condition.copy(sort="created",  direction="desc").toURL">
+        @helper.html.checkicon(condition.sort == "created"  && condition.direction == "desc") Newest
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="created",  direction="asc" ).toURL">
+        @helper.html.checkicon(condition.sort == "created"  && condition.direction == "asc") Oldest
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="comments", direction="desc").toURL">
+        @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "desc") Most commented
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="comments", direction="asc" ).toURL">
+        @helper.html.checkicon(condition.sort == "comments"  && condition.direction == "asc") Least commented
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="updated",  direction="desc").toURL">
+        @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "desc") Recently updated
+      </a>
+    </li>
+    <li>
+      <a href="@condition.copy(sort="updated",  direction="asc" ).toURL">
+        @helper.html.checkicon(condition.sort == "updated"  && condition.direction == "asc") Least recently updated
+      </a>
+    </li>
+  }
   <table class="table table-bordered table-hover table-issues">
   @if(issues.isEmpty){
     <tr>

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

@@ -0,0 +1,9 @@
+@(hasConflict: Boolean)
+@if(hasConflict){
+  <h4>We can’t automatically merge these branches</h4>
+  <p>Don't worry, you can still submit the pull request.</p>
+} else {
+  <h4 style="color: #468847;">Able to merge</h4>
+  <p>These branches can be automatically merged.</p>
+}
+<input type="submit" class="btn btn-success btn-block" value="Send pull request"/>