(refs #458)Skip unexpected commit message

This patch is temporary measures.
MUST create AutoUpdate before release 2.3.

README.md

@@ -80,6 +80,14 @@ Run the following commands in `Terminal` to
 
 Release Notes
 --------
+### 2.2 - 4 Aug 2014
+- Plug-in system is available
+- Move to Scala 2.11, Scalatra 2.3 and Slick 2.1
+- tar.gz export for repository contents
+- LDAP authentication improvement (mail address became optional)
+- Show news feed of a private repository to members
+- Some bug fix and improvements
+
 ### 2.1 - 6 Jul 2014
 - Upgrade to Slick 2.0 from 1.9
 - Base part of the plug-in system is merged

build.xml

@@ -4,7 +4,7 @@
   <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="scala.version" value="2.11"/>
   <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"/>

project/build.scala

@@ -8,8 +8,8 @@ object MyBuild extends Build {
   val Organization = "jp.sf.amateras"
   val Name = "gitbucket"
   val Version = "0.0.1"
-  val ScalaVersion = "2.10.3"
+  val ScalaVersion = "2.11.2"
-  val ScalatraVersion = "2.2.1"
+  val ScalatraVersion = "2.3.0"
 
   lazy val project = Project (
     "gitbucket",
@@ -26,23 +26,24 @@ object MyBuild extends Build {
       ),
       scalacOptions := Seq("-deprecation", "-language:postfixOps"),
       libraryDependencies ++= Seq(
-        "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.0.0.201306101825-r",
+        "org.eclipse.jgit" % "org.eclipse.jgit.http.server" % "3.4.1.201406201815-r",
+        "org.eclipse.jgit" % "org.eclipse.jgit.archive" % "3.4.1.201406201815-r",
         "org.scalatra" %% "scalatra" % ScalatraVersion,
         "org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test",
         "org.scalatra" %% "scalatra-json" % ScalatraVersion,
-        "org.json4s" %% "json4s-jackson" % "3.2.5",
+        "org.json4s" %% "json4s-jackson" % "3.2.10",
-        "jp.sf.amateras" %% "scalatra-forms" % "0.0.14",
+        "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
         "commons-io" % "commons-io" % "2.4",
         "org.pegdown" % "pegdown" % "1.4.1",
         "org.apache.commons" % "commons-compress" % "1.5",
         "org.apache.commons" % "commons-email" % "1.3.1",
         "org.apache.httpcomponents" % "httpclient" % "4.3",
         "org.apache.sshd" % "apache-sshd" % "0.11.0",
-        "com.typesafe.slick" %% "slick" % "2.0.2",
+        "com.typesafe.slick" %% "slick" % "2.1.0-RC3",
         "org.mozilla" % "rhino" % "1.7R4",
         "com.novell.ldap" % "jldap" % "2009-10-07",
         "org.quartz-scheduler" % "quartz" % "2.2.1",
-        "com.h2database" % "h2" % "1.3.173",
+        "com.h2database" % "h2" % "1.4.180",
         "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"),

src/main/scala/app/ControllerBase.scala

@@ -24,8 +24,9 @@ abstract class ControllerBase extends ScalatraFilter
 
   implicit val jsonFormats = DefaultFormats
 
-  // Don't set content type via Accept header.
+// TODO Scala 2.11
-  override def format(implicit request: HttpServletRequest) = ""
+//  // Don't set content type via Accept header.
+//  override def format(implicit request: HttpServletRequest) = ""
 
   override def doFilter(request: ServletRequest, response: ServletResponse, chain: FilterChain): Unit = try {
     val httpRequest  = request.asInstanceOf[HttpServletRequest]
@@ -125,11 +126,13 @@ abstract class ControllerBase extends ScalatraFilter
       }
     }
 
-  override def fullUrl(path: String, params: Iterable[(String, Any)] = Iterable.empty,
+  // TODO Scala 2.11
-                       includeContextPath: Boolean = true, includeServletPath: Boolean = true)
+  override def url(path: String, params: Iterable[(String, Any)] = Iterable.empty,
-                      (implicit request: HttpServletRequest, response: HttpServletResponse) =
+                   includeContextPath: Boolean = true, includeServletPath: Boolean = true,
+                   absolutize: Boolean = true, withSessionId: Boolean = true)
+                  (implicit request: HttpServletRequest, response: HttpServletResponse): String =
     if (path.startsWith("http")) path
-    else baseUrl + url(path, params, false, false, false)
+    else baseUrl + super.url(path, params, false, false, false)
 
 }
 

src/main/scala/app/DashboardController.scala

@@ -49,21 +49,21 @@ trait DashboardControllerBase extends ControllerBase {
     )
 
     val userName   = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, context.baseUrl).map(repo => repo.owner -> repo.name)
+    val userRepos  = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
     val filterUser = Map(filter -> userName)
     val page = IssueSearchCondition.page(request)
-    // 
+
     dashboard.html.issues(
         issues.html.listparts(
-            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, repositories: _*),
+            searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
             page,
-            countIssue(condition.copy(state = "open"), filterUser, false, repositories: _*),
+            countIssue(condition.copy(state = "open"  ), filterUser, false, userRepos: _*),
-            countIssue(condition.copy(state = "closed"), filterUser, false, repositories: _*),
+            countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*),
             condition),
-        countIssue(condition, Map.empty, false, repositories: _*),
+        countIssue(condition, Map.empty, false, userRepos: _*),
-        countIssue(condition, Map("assigned" -> userName), false, repositories: _*),
+        countIssue(condition, Map("assigned"   -> userName), false, userRepos: _*),
-        countIssue(condition, Map("created_by" -> userName), false, repositories: _*),
+        countIssue(condition, Map("created_by" -> userName), false, userRepos: _*),
-        countIssueGroupByRepository(condition, filterUser, false, repositories: _*),
+        countIssueGroupByRepository(condition, filterUser, false, userRepos: _*),
         condition,
         filter)    
     
@@ -80,25 +80,26 @@ trait DashboardControllerBase extends ControllerBase {
     }.copy(repo = repository))
 
     val userName   = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, context.baseUrl).map(repo => repo.owner -> repo.name)
+    val allRepos   = getAllRepositories()
+    val userRepos  = getUserRepositories(userName, context.baseUrl, true).map(repo => repo.owner -> repo.name)
     val filterUser = Map(filter -> userName)
     val page = IssueSearchCondition.page(request)
 
     val counts = countIssueGroupByRepository(
-      IssueSearchCondition().copy(state = condition.state), Map.empty, true, repositories: _*)
+      IssueSearchCondition().copy(state = condition.state), Map.empty, true, userRepos: _*)
 
     dashboard.html.pulls(
       pulls.html.listparts(
-        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, repositories: _*),
+        searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, allRepos: _*),
         page,
-        countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
+        countIssue(condition.copy(state = "open"  ), filterUser, true, allRepos: _*),
-        countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
+        countIssue(condition.copy(state = "closed"), filterUser, true, allRepos: _*),
         condition,
         None,
         false),
       getPullRequestCountGroupByUser(condition.state == "closed", None, None),
-      getRepositoryNamesOfUser(userName).map { RepoName =>
+      userRepos.map { case (userName, repoName) =>
-        (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))
+        (userName, repoName, counts.find { x => x._1 == userName && x._2 == repoName }.map(_._3).getOrElse(0))
       }.sortBy(_._3).reverse,
       condition,
       filter)

src/main/scala/app/IndexController.scala

@@ -20,11 +20,23 @@ trait IndexControllerBase extends ControllerBase {
 
   get("/"){
     val loginAccount = context.loginAccount
-
+    if(loginAccount.isEmpty) {
         html.index(getRecentActivities(),
             getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
             loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil)
         )
+    } else {
+        val loginUserName = loginAccount.get.userName
+        val loginUserGroups = getGroupsByUserName(loginUserName)
+        var visibleOwnerSet : Set[String] = Set(loginUserName)
+        
+        visibleOwnerSet ++= loginUserGroups
+
+        html.index(getRecentActivitiesByOwners(visibleOwnerSet),
+            getVisibleRepositories(loginAccount, context.baseUrl, withoutPhysicalInfo = true),
+            loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl, withoutPhysicalInfo = true) }.getOrElse(Nil) 
+        )
+    }
   }
 
   get("/signin"){
@@ -59,6 +71,10 @@ trait IndexControllerBase extends ControllerBase {
     session.setAttribute(Keys.Session.LoginAccount, account)
     updateLastLoginDate(account.userName)
 
+    if(LDAPUtil.isDummyMailAddress(account)) {
+      redirect("/" + account.userName + "/_edit")
+    }
+
     flash.get(Keys.Flash.Redirect).asInstanceOf[Option[String]].map { redirectUrl =>
       if(redirectUrl.stripSuffix("/") == request.getContextPath){
         redirect("/")
@@ -72,8 +88,6 @@ trait IndexControllerBase extends ControllerBase {
 
   /**
    * JSON API for collaborator completion.
-   *
-   * TODO Move to other controller?
    */
   get("/_user/proposals")(usersOnly {
     contentType = formats("json")
@@ -82,5 +96,11 @@ trait IndexControllerBase extends ControllerBase {
     )
   })
 
+  /**
+   * JSON APU for checking user existence.
+   */
+  post("/_user/existence")(usersOnly {
+    getAccountByUserName(params("userName")).isDefined
+  })
 
 }

src/main/scala/app/PullRequestsController.scala

@@ -156,7 +156,7 @@ trait PullRequestsControllerBase extends ControllerBase {
             val personIdent = new PersonIdent(loginAccount.fullName, loginAccount.mailAddress)
             mergeCommit.setAuthor(personIdent)
             mergeCommit.setCommitter(personIdent)
-            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestRepositoryName}\n\n" +
+            mergeCommit.setMessage(s"Merge pull request #${issueId} from ${pullreq.requestUserName}/${pullreq.requestBranch}\n\n" +
                                    form.message)
 
             // insertObject and got mergeCommit Object Id
@@ -443,7 +443,7 @@ trait PullRequestsControllerBase extends ControllerBase {
       val commits = newGit.log.addRange(oldId, newId).call.iterator.asScala.map { revCommit =>
         new CommitInfo(revCommit)
       }.toList.splitWith { (commit1, commit2) =>
-        view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+        view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
       }
 
       val diffs = JGitUtil.getDiffs(newGit, oldId.getName, newId.getName, true)

src/main/scala/app/RepositoryViewerController.scala

@@ -8,23 +8,31 @@ import _root_.util._
 import service._
 import org.scalatra._
 import java.io.File
-import org.eclipse.jgit.api.Git
+
+import org.eclipse.jgit.api.{ArchiveCommand, Git}
+import org.eclipse.jgit.archive.{TgzFormat, ZipFormat}
 import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
-import java.util.zip.{ZipEntry, ZipOutputStream}
 import jp.sf.amateras.scalatra.forms._
 import org.eclipse.jgit.dircache.DirCache
-import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}
+import org.eclipse.jgit.revwalk.RevCommit
+import service.WebHookService.WebHookPayload
 
 class RepositoryViewerController extends RepositoryViewerControllerBase
-  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator
+  with RepositoryService with AccountService with ActivityService with IssuesService with WebHookService
+  with ReferrerAuthenticator with CollaboratorsAuthenticator
+
 
 /**
  * The repository viewer.
  */
 trait RepositoryViewerControllerBase extends ControllerBase {
-  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+  self: RepositoryService with AccountService with ActivityService with IssuesService with WebHookService
+    with ReferrerAuthenticator with CollaboratorsAuthenticator =>
+
+  ArchiveCommand.registerFormat("zip", new ZipFormat)
+  ArchiveCommand.registerFormat("tar.gz", new TgzFormat)
 
   case class EditorForm(
     branch: String,
@@ -32,6 +40,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     content: String,
     message: Option[String],
     charset: String,
+    lineSeparator: String,
     newFileName: String,
     oldFileName: Option[String]
   )
@@ -49,6 +58,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     "content"       -> trim(label("Content", text(required))),
     "message"       -> trim(label("Message", optional(text()))),
     "charset"       -> trim(label("Charset", text(required))),
+    "lineSeparator" -> trim(label("Line Separator", text(required))),
     "newFileName"   -> trim(label("Filename", text(required))),
     "oldFileName"   -> trim(label("Old filename", optional(text())))
   )(EditorForm.apply)
@@ -101,7 +111,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         case Right((logs, hasNext)) =>
           repo.html.commits(if(path.isEmpty) Nil else path.split("/").toList, branchName, repository,
             logs.splitWith{ (commit1, commit2) =>
-              view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
+              view.helpers.date(commit1.commitTime) == view.helpers.date(commit2.commitTime)
             }, page, hasNext)
         case Left(_) => NotFound
       }
@@ -142,7 +152,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/create", editorForm)(collaboratorsOnly { (form, repository) =>
-    commitFile(repository, form.branch, form.path, Some(form.newFileName), None, form.content, form.charset,
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), None,
+      StringUtil.convertLineSeparator(form.content, form.lineSeparator), form.charset,
       form.message.getOrElse(s"Create ${form.newFileName}"))
 
     redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
@@ -151,7 +162,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/update", editorForm)(collaboratorsOnly { (form, repository) =>
-    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName, form.content, form.charset,
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName,
+      StringUtil.convertLineSeparator(form.content, form.lineSeparator), form.charset,
       if(form.oldFileName.exists(_ == form.newFileName)){
         form.message.getOrElse(s"Update ${form.newFileName}")
       } else {
@@ -252,50 +264,12 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    * Download repository contents as an archive.
    */
   get("/:owner/:repository/archive/*")(referrersOnly { repository =>
-    val name = multiParams("splat").head
+    multiParams("splat").head match {
-
+      case name if name.endsWith(".zip") =>
-    if(name.endsWith(".zip")){
+        archiveRepository(name, ".zip", repository)
-      val revision = name.stripSuffix(".zip")
+      case name if name.endsWith(".tar.gz") =>
-      val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
+        archiveRepository(name, ".tar.gz", repository)
-      if(workDir.exists){
+      case _ => BadRequest
-        FileUtils.deleteDirectory(workDir)
-      }
-      workDir.mkdirs
-
-      val zipFile = new File(workDir, repository.name + "-" +
-        (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + ".zip")
-
-      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
-        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.REGULAR_FILE || mode == FileMode.EXECUTABLE_FILE){
-                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"
-      response.setHeader("Content-Disposition", s"attachment; filename=${zipFile.getName}")
-      zipFile
-    } else {
-      BadRequest
     }
   })
 
@@ -408,8 +382,19 @@ trait RepositoryViewerControllerBase extends ControllerBase {
         recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch,
           List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
 
-        // TODO invoke hook
+        // close issue by commit message
+        closeIssuesFromMessage(message, loginAccount.userName, repository.owner, repository.name)
 
+        // call web hook
+        val commit = new JGitUtil.CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))
+        getWebHookURLs(repository.owner, repository.name) match {
+          case webHookURLs if(webHookURLs.nonEmpty) =>
+            for(ownerAccount <- getAccountByUserName(repository.owner)){
+              callWebHook(repository.owner, repository.name, webHookURLs,
+                WebHookPayload(git, loginAccount, headName, repository, List(commit), ownerAccount))
+            }
+          case _ =>
+        }
       }
     }
   }
@@ -429,4 +414,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     }
   }
 
+  private def archiveRepository(name: String, suffix: String, repository: RepositoryService.RepositoryInfo): File = {
+    val revision = name.stripSuffix(suffix)
+    val workDir = getDownloadWorkDir(repository.owner, repository.name, session.getId)
+    if(workDir.exists) {
+      FileUtils.deleteDirectory(workDir)
+    }
+    workDir.mkdirs
+
+    val file = new File(workDir, repository.name + "-" +
+      (if(revision.length == 40) revision.substring(0, 10) else revision).replace('/', '_') + suffix)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(revision))
+      using(new java.io.FileOutputStream(file))  { out =>
+        git.archive
+           .setFormat(suffix.tail)
+           .setTree(revCommit.getTree)
+           .setOutputStream(out)
+           .call()
+      }
+      contentType = "application/octet-stream"
+      response.setHeader("Content-Disposition", s"attachment; filename=${file.getName}")
+      file
+    }
+  }
 }

src/main/scala/app/SystemSettingsController.scala

@@ -10,6 +10,7 @@ import ssh.SshServer
 import org.apache.commons.io.FileUtils
 import java.io.FileInputStream
 import plugin.{Plugin, PluginSystem}
+import org.scalatra.Ok
 
 class SystemSettingsController extends SystemSettingsControllerBase
   with AccountService with AdminAuthenticator
@@ -41,8 +42,9 @@ trait SystemSettingsControllerBase extends ControllerBase {
         "bindPassword"             -> trim(label("Bind Password", optional(text()))),
         "baseDN"                   -> trim(label("Base DN", text(required))),
         "userNameAttribute"        -> trim(label("User name attribute", text(required))),
+        "additionalFilterCondition"-> trim(label("Additional filter condition", optional(text()))),
         "fullNameAttribute"        -> trim(label("Full name attribute", optional(text()))),
-        "mailAttribute"            -> trim(label("Mail address attribute", text(required))),
+        "mailAttribute"            -> trim(label("Mail address attribute", optional(text()))),
         "tls"                      -> trim(label("Enable TLS", optional(boolean()))),
         "keystore"                 -> trim(label("Keystore", optional(text())))
     )(Ldap.apply))
@@ -81,34 +83,33 @@ trait SystemSettingsControllerBase extends ControllerBase {
     redirect("/admin/system")
   })
 
-// TODO Enable commented code to enable plug-in system
+  get("/admin/plugins")(adminOnly {
-//  get("/admin/plugins")(adminOnly {
+    val installedPlugins = plugin.PluginSystem.plugins
-//    val installedPlugins = plugin.PluginSystem.plugins
+    val updatablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "updatable")
-//    val updatablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "updatable")
+    admin.plugins.html.installed(installedPlugins, updatablePlugins)
-//    admin.plugins.html.installed(installedPlugins, updatablePlugins)
+  })
-//  })
+
-//
+  post("/admin/plugins/_update", pluginForm)(adminOnly { form =>
-//  post("/admin/plugins/_update", pluginForm)(adminOnly { form =>
+    deletePlugins(form.pluginIds)
-//    deletePlugins(form.pluginIds)
+    installPlugins(form.pluginIds)
-//    installPlugins(form.pluginIds)
+    redirect("/admin/plugins")
-//    redirect("/admin/plugins")
+  })
-//  })
+
-//
+  post("/admin/plugins/_delete", pluginForm)(adminOnly { form =>
-//  post("/admin/plugins/_delete", pluginForm)(adminOnly { form =>
+    deletePlugins(form.pluginIds)
-//    deletePlugins(form.pluginIds)
+    redirect("/admin/plugins")
-//    redirect("/admin/plugins")
+  })
-//  })
+
-//
+  get("/admin/plugins/available")(adminOnly {
-//  get("/admin/plugins/available")(adminOnly {
+    val installedPlugins = plugin.PluginSystem.plugins
-//    val installedPlugins = plugin.PluginSystem.plugins
+    val availablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "available")
-//    val availablePlugins = getAvailablePlugins(installedPlugins).filter(_.status == "available")
+    admin.plugins.html.available(availablePlugins)
-//    admin.plugins.html.available(availablePlugins)
+  })
-//  })
+
-//
+  post("/admin/plugins/_install", pluginForm)(adminOnly { form =>
-//  post("/admin/plugins/_install", pluginForm)(adminOnly { form =>
+    installPlugins(form.pluginIds)
-//    installPlugins(form.pluginIds)
+    redirect("/admin/plugins")
-//    redirect("/admin/plugins")
+  })
-//  })
 
 //  get("/admin/plugins/console")(adminOnly {
 //    admin.plugins.html.console()

src/main/scala/app/UserManagementController.scala

@@ -182,11 +182,6 @@ trait UserManagementControllerBase extends AccountManagementControllerBase {
     }
   })
 
-  // TODO Move to other generic controller?
-  post("/admin/users/_usercheck"){
-    getAccountByUserName(params("userName")).isDefined
-  }
-
   private def members: Constraint = new Constraint(){
     override def validate(name: String, value: String, messages: Messages): Option[String] = {
       if(value.split(",").exists {

src/main/scala/model/Account.scala

@@ -21,9 +21,9 @@ trait AccountComponent { self: Profile =>
     val removed = column[Boolean]("REMOVED")
     def * = (userName, fullName, mailAddress, password, isAdmin, url.?, registeredDate, updatedDate, lastLoginDate.?, image.?, groupAccount, removed) <> (Account.tupled, Account.unapply)
   }
+}
 
-  case class Account(
+case class Account(
-
   userName: String,
   fullName: String,
   mailAddress: String,
@@ -36,5 +36,4 @@ trait AccountComponent { self: Profile =>
   image: Option[String],
   isGroupAccount: Boolean,
   isRemoved: Boolean
-  )
+)
-}

src/main/scala/model/Activity.scala

@@ -15,8 +15,9 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
     val activityDate = column[java.util.Date]("ACTIVITY_DATE")
     def * = (userName, repositoryName, activityUserName, activityType, message, additionalInfo.?, activityDate, activityId) <> (Activity.tupled, Activity.unapply)
   }
+}
 
-  case class Activity(
+case class Activity(
   userName: String,
   repositoryName: String,
   activityUserName: String,
@@ -25,5 +26,4 @@ trait ActivityComponent extends TemplateComponent { self: Profile =>
   additionalInfo: Option[String],
   activityDate: java.util.Date,
   activityId: Int = 0
-  )
+)
-}

src/main/scala/model/BasicTemplate.scala

@@ -8,40 +8,40 @@ protected[model] trait TemplateComponent { self: Profile =>
     val repositoryName = column[String]("REPOSITORY_NAME")
 
     def byRepository(owner: String, repository: String) =
-      (userName is owner.bind) && (repositoryName is repository.bind)
+      (userName === owner.bind) && (repositoryName === repository.bind)
 
     def byRepository(userName: Column[String], repositoryName: Column[String]) =
-      (this.userName is userName) && (this.repositoryName is repositoryName)
+      (this.userName === userName) && (this.repositoryName === repositoryName)
   }
 
   trait IssueTemplate extends BasicTemplate { self: Table[_] =>
     val issueId = column[Int]("ISSUE_ID")
 
     def byIssue(owner: String, repository: String, issueId: Int) =
-      byRepository(owner, repository) && (this.issueId is issueId.bind)
+      byRepository(owner, repository) && (this.issueId === issueId.bind)
 
     def byIssue(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) =
-      byRepository(userName, repositoryName) && (this.issueId is issueId)
+      byRepository(userName, repositoryName) && (this.issueId === issueId)
   }
 
   trait LabelTemplate extends BasicTemplate { self: Table[_] =>
     val labelId = column[Int]("LABEL_ID")
 
     def byLabel(owner: String, repository: String, labelId: Int) =
-      byRepository(owner, repository) && (this.labelId is labelId.bind)
+      byRepository(owner, repository) && (this.labelId === labelId.bind)
 
     def byLabel(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) =
-      byRepository(userName, repositoryName) && (this.labelId is labelId)
+      byRepository(userName, repositoryName) && (this.labelId === labelId)
   }
 
   trait MilestoneTemplate extends BasicTemplate { self: Table[_] =>
     val milestoneId = column[Int]("MILESTONE_ID")
 
     def byMilestone(owner: String, repository: String, milestoneId: Int) =
-      byRepository(owner, repository) && (this.milestoneId is milestoneId.bind)
+      byRepository(owner, repository) && (this.milestoneId === milestoneId.bind)
 
     def byMilestone(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) =
-      byRepository(userName, repositoryName) && (this.milestoneId is milestoneId)
+      byRepository(userName, repositoryName) && (this.milestoneId === milestoneId)
   }
 
 }

src/main/scala/model/Collaborator.scala

@@ -10,12 +10,12 @@ trait CollaboratorComponent extends TemplateComponent { self: Profile =>
     def * = (userName, repositoryName, collaboratorName) <> (Collaborator.tupled, Collaborator.unapply)
 
     def byPrimaryKey(owner: String, repository: String, collaborator: String) =
-      byRepository(owner, repository) && (collaboratorName is collaborator.bind)
+      byRepository(owner, repository) && (collaboratorName === collaborator.bind)
   }
+}
 
-  case class Collaborator(
+case class Collaborator(
   userName: String,
   repositoryName: String,
   collaboratorName: String
-  )
+)
-}

src/main/scala/model/GroupMembers.scala

@@ -11,10 +11,10 @@ trait GroupMemberComponent { self: Profile =>
     val isManager = column[Boolean]("MANAGER")
     def * = (groupName, userName, isManager) <> (GroupMember.tupled, GroupMember.unapply)
   }
+}
 
-  case class GroupMember(
+case class GroupMember(
   groupName: String,
   userName: String,
   isManager: Boolean
-  )
+)
-}

src/main/scala/model/Issue.scala

@@ -31,8 +31,9 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
 
     def byPrimaryKey(owner: String, repository: String, issueId: Int) = byIssue(owner, repository, issueId)
   }
+}
 
-  case class Issue(
+case class Issue(
   userName: String,
   repositoryName: String,
   issueId: Int,
@@ -44,5 +45,5 @@ trait IssueComponent extends TemplateComponent { self: Profile =>
   closed: Boolean,
   registeredDate: java.util.Date,
   updatedDate: java.util.Date,
-    isPullRequest: Boolean)
+  isPullRequest: Boolean
-}
+)

src/main/scala/model/IssueComment.scala

@@ -17,10 +17,11 @@ trait IssueCommentComponent extends TemplateComponent { self: Profile =>
     val updatedDate = column[java.util.Date]("UPDATED_DATE")
     def * = (userName, repositoryName, issueId, commentId, action, commentedUserName, content, registeredDate, updatedDate) <> (IssueComment.tupled, IssueComment.unapply)
 
-    def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
+    def byPrimaryKey(commentId: Int) = this.commentId === commentId.bind
   }
+}
 
-  case class IssueComment(
+case class IssueComment(
   userName: String,
   repositoryName: String,
   issueId: Int,
@@ -30,5 +31,4 @@ trait IssueCommentComponent extends TemplateComponent { self: Profile =>
   content: String,
   registeredDate: java.util.Date,
   updatedDate: java.util.Date
-  )
+)
-}

src/main/scala/model/IssueLabels.scala

@@ -8,12 +8,13 @@ trait IssueLabelComponent extends TemplateComponent { self: Profile =>
   class IssueLabels(tag: Tag) extends Table[IssueLabel](tag, "ISSUE_LABEL") with IssueTemplate with LabelTemplate {
     def * = (userName, repositoryName, issueId, labelId) <> (IssueLabel.tupled, IssueLabel.unapply)
     def byPrimaryKey(owner: String, repository: String, issueId: Int, labelId: Int) =
-      byIssue(owner, repository, issueId) && (this.labelId is labelId.bind)
+      byIssue(owner, repository, issueId) && (this.labelId === labelId.bind)
   }
+}
 
-  case class IssueLabel(
+case class IssueLabel(
   userName: String,
   repositoryName: String,
   issueId: Int,
-    labelId: Int)
+  labelId: Int
-}
+)

src/main/scala/model/Labels.scala

@@ -14,8 +14,9 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(owner: String, repository: String, labelId: Int) = byLabel(owner, repository, labelId)
     def byPrimaryKey(userName: Column[String], repositoryName: Column[String], labelId: Column[Int]) = byLabel(userName, repositoryName, labelId)
   }
+}
 
-  case class Label(
+case class Label(
   userName: String,
   repositoryName: String,
   labelId: Int = 0,
@@ -33,5 +34,4 @@ trait LabelComponent extends TemplateComponent { self: Profile =>
       "FFFFFF"
     }
   }
-  }
 }

src/main/scala/model/Milestone.scala

@@ -17,13 +17,14 @@ trait MilestoneComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(owner: String, repository: String, milestoneId: Int) = byMilestone(owner, repository, milestoneId)
     def byPrimaryKey(userName: Column[String], repositoryName: Column[String], milestoneId: Column[Int]) = byMilestone(userName, repositoryName, milestoneId)
   }
+}
 
-  case class Milestone(
+case class Milestone(
   userName: String,
   repositoryName: String,
   milestoneId: Int = 0,
   title: String,
   description: Option[String],
   dueDate: Option[java.util.Date],
-    closedDate: Option[java.util.Date])
+  closedDate: Option[java.util.Date]
-}
+)

src/main/scala/model/Profile.scala

@@ -1,9 +1,7 @@
 package model
 
-import slick.driver.JdbcProfile
-
 trait Profile {
-  val profile: JdbcProfile
+  val profile: slick.driver.JdbcProfile
   import profile.simple._
 
   // java.util.Date Mapped Column Types
@@ -17,3 +15,27 @@ trait Profile {
   }
 
 }
+
+object Profile extends {
+  val profile = slick.driver.H2Driver
+
+} with AccountComponent
+  with ActivityComponent
+  with CollaboratorComponent
+  with GroupMemberComponent
+  with IssueComponent
+  with IssueCommentComponent
+  with IssueLabelComponent
+  with LabelComponent
+  with MilestoneComponent
+  with PullRequestComponent
+  with RepositoryComponent
+  with SshKeyComponent
+  with WebHookComponent with Profile {
+
+  /**
+   * Returns system date.
+   */
+  def currentDate = new java.util.Date()
+
+}

src/main/scala/model/PullRequest.scala

@@ -17,8 +17,9 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
     def byPrimaryKey(userName: String, repositoryName: String, issueId: Int) = byIssue(userName, repositoryName, issueId)
     def byPrimaryKey(userName: Column[String], repositoryName: Column[String], issueId: Column[Int]) = byIssue(userName, repositoryName, issueId)
   }
+}
 
-  case class PullRequest(
+case class PullRequest(
   userName: String,
   repositoryName: String,
   issueId: Int,
@@ -28,5 +29,4 @@ trait PullRequestComponent extends TemplateComponent { self: Profile =>
   requestBranch: String,
   commitIdFrom: String,
   commitIdTo: String
-  )
+)
-}

src/main/scala/model/Repository.scala

@@ -21,8 +21,9 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
 
     def byPrimaryKey(owner: String, repository: String) = byRepository(owner, repository)
   }
+}
 
-  case class Repository(
+case class Repository(
   userName: String,
   repositoryName: String,
   isPrivate: Boolean,
@@ -35,5 +36,4 @@ trait RepositoryComponent extends TemplateComponent { self: Profile =>
   originRepositoryName: Option[String],
   parentUserName: Option[String],
   parentRepositoryName: Option[String]
-  )
+)
-}

src/main/scala/model/SshKey.scala

@@ -12,13 +12,13 @@ trait SshKeyComponent { self: Profile =>
     val publicKey = column[String]("PUBLIC_KEY")
     def * = (userName, sshKeyId, title, publicKey) <> (SshKey.tupled, SshKey.unapply)
 
-    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName is userName.bind) && (this.sshKeyId is sshKeyId.bind)
+    def byPrimaryKey(userName: String, sshKeyId: Int) = (this.userName === userName.bind) && (this.sshKeyId === sshKeyId.bind)
   }
+}
 
-  case class SshKey(
+case class SshKey(
   userName: String,
   sshKeyId: Int = 0,
   title: String,
   publicKey: String
-  )
+)
-}

src/main/scala/model/WebHook.scala

@@ -9,12 +9,12 @@ trait WebHookComponent extends TemplateComponent { self: Profile =>
     val url = column[String]("URL")
     def * = (userName, repositoryName, url) <> (WebHook.tupled, WebHook.unapply)
 
-    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url is url.bind)
+    def byPrimaryKey(owner: String, repository: String, url: String) = byRepository(owner, repository) && (this.url === url.bind)
   }
+}
 
-  case class WebHook(
+case class WebHook(
   userName: String,
   repositoryName: String,
   url: String
-  )
+)
-}

src/main/scala/model/package.scala

@@ -1,24 +1,3 @@
-package object model extends {
+package object model {
-  // TODO [Slick 2.0]Should be configurable?
+  type Session = slick.jdbc.JdbcBackend#Session
-  val profile = slick.driver.H2Driver
-  // TODO [Slick 2.0]To avoid compilation error about delete invocation. Why can't this error be resolved by import profile.simple._?
-  val simple = profile.simple
-
-} with AccountComponent
-  with ActivityComponent
-  with CollaboratorComponent
-  with GroupMemberComponent
-  with IssueComponent
-  with IssueCommentComponent
-  with IssueLabelComponent
-  with LabelComponent
-  with MilestoneComponent
-  with PullRequestComponent
-  with RepositoryComponent
-  with SshKeyComponent
-  with WebHookComponent with Profile {
-  /**
-   * Returns system date.
-   */
-  def currentDate = new java.util.Date()
 }

src/main/scala/plugin/JavaScriptPlugin.scala

@@ -3,19 +3,24 @@ package plugin
 import org.mozilla.javascript.{Context => JsContext}
 import org.mozilla.javascript.{Function => JsFunction}
 import scala.collection.mutable.ListBuffer
-import plugin.PluginSystem.{Action, GlobalMenu, RepositoryMenu}
+import plugin.PluginSystem._
+import util.ControlUtil._
+import plugin.PluginSystem.GlobalMenu
+import plugin.PluginSystem.RepositoryAction
+import plugin.PluginSystem.Action
+import plugin.PluginSystem.RepositoryMenu
 
 class JavaScriptPlugin(val id: String, val version: String,
                        val author: String, val url: String, val description: String) extends Plugin {
 
   private val repositoryMenuList   = ListBuffer[RepositoryMenu]()
   private val globalMenuList       = ListBuffer[GlobalMenu]()
-  private val repositoryActionList = ListBuffer[Action]()
+  private val repositoryActionList = ListBuffer[RepositoryAction]()
   private val globalActionList     = ListBuffer[Action]()
 
   def repositoryMenus   : List[RepositoryMenu]   = repositoryMenuList.toList
   def globalMenus       : List[GlobalMenu]       = globalMenuList.toList
-  def repositoryActions : List[Action]         = repositoryActionList.toList
+  def repositoryActions : List[RepositoryAction] = repositoryActionList.toList
   def globalActions     : List[Action]           = globalActionList.toList
 
   def addRepositoryMenu(label: String, name: String, url: String, icon: String, condition: JsFunction): Unit = {
@@ -52,16 +57,40 @@ class JavaScriptPlugin(val id: String, val version: String,
   }
 
   def addRepositoryAction(path: String, function: JsFunction): Unit = {
-    repositoryActionList += Action(path, (request, response) => {
+    repositoryActionList += RepositoryAction(path, (request, response, repository) => {
       val context = JsContext.enter()
       try {
-        function.call(context, function, function, Array(request, response))
+        function.call(context, function, function, Array(request, response, repository))
       } finally {
         JsContext.exit()
       }
     })
   }
 
+  object db {
+    // TODO Use JavaScript Map instead of java.util.Map
+    def select(sql: String): Array[java.util.Map[String, String]] = {
+      defining(PluginConnectionHolder.threadLocal.get){ conn =>
+        using(conn.prepareStatement(sql)){ stmt =>
+          using(stmt.executeQuery()){ rs =>
+            val list = new java.util.ArrayList[java.util.Map[String, String]]()
+            while(rs.next){
+              defining(rs.getMetaData){ meta =>
+                val map = new java.util.HashMap[String, String]()
+                Range(1, meta.getColumnCount).map { i =>
+                  val name = meta.getColumnName(i)
+                  map.put(name, rs.getString(name))
+                }
+                list.add(map)
+              }
+            }
+            list.toArray(new Array[java.util.Map[String, String]](list.size))
+          }
+        }
+      }
+    }
+  }
+
 }
 
 object JavaScriptPlugin {

src/main/scala/plugin/Plugin.scala

@@ -1,6 +1,7 @@
 package plugin
 
-import plugin.PluginSystem.{Action, GlobalMenu, RepositoryMenu}
+import plugin.PluginSystem._
+import java.sql.Connection
 
 trait Plugin {
   val id: String
@@ -11,6 +12,10 @@ trait Plugin {
 
   def repositoryMenus   : List[RepositoryMenu]
   def globalMenus       : List[GlobalMenu]
-  def repositoryActions : List[Action]
+  def repositoryActions : List[RepositoryAction]
   def globalActions     : List[Action]
 }
+
+object PluginConnectionHolder {
+  val threadLocal = new ThreadLocal[Connection]
+}

src/main/scala/plugin/PluginSystem.scala

@@ -9,6 +9,7 @@ import util.ControlUtil._
 import org.apache.commons.io.FileUtils
 import util.JGitUtil
 import org.eclipse.jgit.api.Git
+import service.RepositoryService.RepositoryInfo
 
 /**
  * Provides extension points to plug-ins.
@@ -78,7 +79,7 @@ object PluginSystem {
 
   def repositoryMenus   : List[RepositoryMenu]   = pluginsMap.values.flatMap(_.repositoryMenus).toList
   def globalMenus       : List[GlobalMenu]       = pluginsMap.values.flatMap(_.globalMenus).toList
-  def repositoryActions : List[Action]         = pluginsMap.values.flatMap(_.repositoryActions).toList
+  def repositoryActions : List[RepositoryAction] = pluginsMap.values.flatMap(_.repositoryActions).toList
   def globalActions     : List[Action]           = pluginsMap.values.flatMap(_.globalActions).toList
 
   // Case classes to hold plug-ins information internally in GitBucket
@@ -86,6 +87,7 @@ object PluginSystem {
   case class GlobalMenu(label: String, url: String, icon: String, condition: Context => Boolean)
   case class RepositoryMenu(label: String, name: String, url: String, icon: String, condition: Context => Boolean)
   case class Action(path: String, function: (HttpServletRequest, HttpServletResponse) => Any)
+  case class RepositoryAction(path: String, function: (HttpServletRequest, HttpServletResponse, RepositoryInfo) => Any)
 
   /**
    * Checks whether the plugin is updatable.

src/main/scala/plugin/PluginUpdateJob.scala

@@ -50,18 +50,17 @@ class PluginUpdateJob extends Job {
 object PluginUpdateJob {
 
   def schedule(scheduler: Scheduler): Unit = {
-// TODO Enable commented code to enable plug-in system
+    val job = newJob(classOf[PluginUpdateJob])
-//    val job = newJob(classOf[PluginUpdateJob])
+      .withIdentity("pluginUpdateJob")
-//      .withIdentity("pluginUpdateJob")
+      .build()
-//      .build()
+
-//
+    val trigger = newTrigger()
-//    val trigger = newTrigger()
+      .withIdentity("pluginUpdateTrigger")
-//      .withIdentity("pluginUpdateTrigger")
+      .startNow()
-//      .startNow()
+      .withSchedule(simpleSchedule().withIntervalInHours(24).repeatForever())
-//      .withSchedule(simpleSchedule().withIntervalInHours(24).repeatForever())
+      .build()
-//      .build()
+
-//
+    scheduler.scheduleJob(job, trigger)
-//    scheduler.scheduleJob(job, trigger)
   }
 
 }

src/main/scala/plugin/ScalaPlugin.scala

@@ -2,8 +2,9 @@ package plugin
 
 import app.Context
 import scala.collection.mutable.ListBuffer
-import plugin.PluginSystem.{Action, GlobalMenu, RepositoryMenu}
+import plugin.PluginSystem._
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
+import service.RepositoryService.RepositoryInfo
 
 // TODO This is a sample implementation for Scala based plug-ins.
 class ScalaPlugin(val id: String, val version: String,
@@ -11,12 +12,12 @@ class ScalaPlugin(val id: String, val version: String,
 
   private val repositoryMenuList   = ListBuffer[RepositoryMenu]()
   private val globalMenuList       = ListBuffer[GlobalMenu]()
-  private val repositoryActionList = ListBuffer[Action]()
+  private val repositoryActionList = ListBuffer[RepositoryAction]()
   private val globalActionList     = ListBuffer[Action]()
 
   def repositoryMenus   : List[RepositoryMenu]   = repositoryMenuList.toList
   def globalMenus       : List[GlobalMenu]       = globalMenuList.toList
-  def repositoryActions : List[Action]         = repositoryActionList.toList
+  def repositoryActions : List[RepositoryAction] = repositoryActionList.toList
   def globalActions     : List[Action]           = globalActionList.toList
 
   def addRepositoryMenu(label: String, name: String, url: String, icon: String)(condition: (Context) => Boolean): Unit = {
@@ -31,8 +32,8 @@ class ScalaPlugin(val id: String, val version: String,
     globalActionList += Action(path, function)
   }
 
-  def addRepositoryAction(path: String)(function: (HttpServletRequest, HttpServletResponse) => Any): Unit = {
+  def addRepositoryAction(path: String)(function: (HttpServletRequest, HttpServletResponse, RepositoryInfo) => Any): Unit = {
-    repositoryActionList += Action(path, function)
+    repositoryActionList += RepositoryAction(path, function)
   }
 
 }

src/main/scala/service/AccountService.scala

@@ -1,9 +1,10 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.{Account, GroupMember}
 // TODO [Slick 2.0]NOT import directly?
-import model.dateColumnType
+import model.Profile.dateColumnType
 import service.SystemSettingsService.SystemSettings
 import util.StringUtil._
 import util.LDAPUtil
@@ -39,7 +40,11 @@ trait AccountService {
         // Create or update account by LDAP information
         getAccountByUserName(ldapUserInfo.userName, true) match {
           case Some(x) if(!x.isRemoved) => {
+            if(settings.ldap.get.mailAttribute.getOrElse("").isEmpty) {
+              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
+            } else {
               updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+            }
             getAccountByUserName(ldapUserInfo.userName)
           }
           case Some(x) if(x.isRemoved)  => {
@@ -70,16 +75,16 @@ trait AccountService {
   }
 
   def getAccountByUserName(userName: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
-    Accounts filter(t => (t.userName is userName.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+    Accounts filter(t => (t.userName === userName.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
 
   def getAccountByMailAddress(mailAddress: String, includeRemoved: Boolean = false)(implicit s: Session): Option[Account] =
-    Accounts filter(t => (t.mailAddress.toLowerCase is mailAddress.toLowerCase.bind) && (t.removed is false.bind, !includeRemoved)) firstOption
+    Accounts filter(t => (t.mailAddress.toLowerCase === mailAddress.toLowerCase.bind) && (t.removed === false.bind, !includeRemoved)) firstOption
 
   def getAllUsers(includeRemoved: Boolean = true)(implicit s: Session): List[Account] =
     if(includeRemoved){
       Accounts sortBy(_.userName) list
     } else {
-      Accounts filter (_.removed is false.bind) sortBy(_.userName) list
+      Accounts filter (_.removed === false.bind) sortBy(_.userName) list
     }
 
   def createAccount(userName: String, password: String, fullName: String, mailAddress: String, isAdmin: Boolean, url: Option[String])
@@ -100,7 +105,7 @@ trait AccountService {
 
   def updateAccount(account: Account)(implicit s: Session): Unit =
     Accounts
-      .filter { a =>  a.userName is account.userName.bind }
+      .filter { a =>  a.userName === account.userName.bind }
       .map    { a => (a.password, a.fullName, a.mailAddress, a.isAdmin, a.url.?, a.registeredDate, a.updatedDate, a.lastLoginDate.?, a.removed) }
       .update (
         account.password,
@@ -114,10 +119,10 @@ trait AccountService {
         account.isRemoved)
 
   def updateAvatarImage(userName: String, image: Option[String])(implicit s: Session): Unit =
-    Accounts.filter(_.userName is userName.bind).map(_.image.?).update(image)
+    Accounts.filter(_.userName === userName.bind).map(_.image.?).update(image)
 
   def updateLastLoginDate(userName: String)(implicit s: Session): Unit =
-    Accounts.filter(_.userName is userName.bind).map(_.lastLoginDate).update(currentDate)
+    Accounts.filter(_.userName === userName.bind).map(_.lastLoginDate).update(currentDate)
 
   def createGroup(groupName: String, url: Option[String])(implicit s: Session): Unit =
     Accounts insert Account(
@@ -135,10 +140,10 @@ trait AccountService {
       isRemoved      = false)
 
   def updateGroup(groupName: String, url: Option[String], removed: Boolean)(implicit s: Session): Unit =
-    Accounts.filter(_.userName is groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)
+    Accounts.filter(_.userName === groupName.bind).map(t => t.url.? -> t.removed).update(url, removed)
 
   def updateGroupMembers(groupName: String, members: List[(String, Boolean)])(implicit s: Session): Unit = {
-    GroupMembers.filter(_.groupName is groupName.bind).delete
+    GroupMembers.filter(_.groupName === groupName.bind).delete
     members.foreach { case (userName, isManager) =>
       GroupMembers insert GroupMember (groupName, userName, isManager)
     }
@@ -146,21 +151,21 @@ trait AccountService {
 
   def getGroupMembers(groupName: String)(implicit s: Session): List[GroupMember] =
     GroupMembers
-      .filter(_.groupName is groupName.bind)
+      .filter(_.groupName === groupName.bind)
       .sortBy(_.userName)
       .list
 
   def getGroupsByUserName(userName: String)(implicit s: Session): List[String] =
     GroupMembers
-      .filter(_.userName is userName.bind)
+      .filter(_.userName === userName.bind)
       .sortBy(_.groupName)
       .map(_.groupName)
       .list
 
   def removeUserRelatedData(userName: String)(implicit s: Session): Unit = {
-    GroupMembers.filter(_.userName is userName.bind).delete
+    GroupMembers.filter(_.userName === userName.bind).delete
-    Collaborators.filter(_.collaboratorName is userName.bind).delete
+    Collaborators.filter(_.collaboratorName === userName.bind).delete
-    Repositories.filter(_.userName is userName.bind).delete
+    Repositories.filter(_.userName === userName.bind).delete
   }
 
 }

src/main/scala/service/ActivityService.scala

@@ -1,7 +1,8 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.Activity
 
 trait ActivityService {
 
@@ -10,9 +11,9 @@ trait ActivityService {
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) =>
         if(isPublic){
-          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+          (t1.activityUserName === activityUserName.bind) && (t2.isPrivate === false.bind)
         } else {
-          (t1.activityUserName is activityUserName.bind)
+          (t1.activityUserName === activityUserName.bind)
         }
       }
       .sortBy { case (t1, t2) => t1.activityId desc }
@@ -23,7 +24,16 @@ trait ActivityService {
   def getRecentActivities()(implicit s: Session): List[Activity] =
     Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter { case (t1, t2) => t2.isPrivate is false.bind }
+      .filter { case (t1, t2) =>  t2.isPrivate === false.bind }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
+
+  def getRecentActivitiesByOwners(owners : Set[String])(implicit s: Session): List[Activity] =
+    Activities
+      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) => (t2.isPrivate === false.bind) || (t2.userName inSetBind owners) }
       .sortBy { case (t1, t2) => t1.activityId desc }
       .map    { case (t1, t2) => t1 }
       .take(30)

src/main/scala/service/IssuesService.scala

@@ -3,8 +3,9 @@ package service
 import scala.slick.jdbc.{StaticQuery => Q}
 import Q.interpolation
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.{Issue, IssueComment, IssueLabel, Label}
 import util.Implicits._
 import util.StringUtil._
 
@@ -49,7 +50,6 @@ trait IssuesService {
    */
   def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], onlyPullRequest: Boolean,
                  repos: (String, String)*)(implicit s: Session): Int =
-    // TODO check SQL
     Query(searchIssueQuery(repos, condition, filterUser, onlyPullRequest).length).first
 
   /**
@@ -166,13 +166,13 @@ trait IssuesService {
           .getOrElse (repos)
           .map { case (owner, repository) => t1.byRepository(owner, repository) }
           .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
-      (t1.closed           is (condition.state == "closed").bind) &&
+      (t1.closed           === (condition.state == "closed").bind) &&
-      (t1.milestoneId      is condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
+      (t1.milestoneId      === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
-      (t1.milestoneId      isNull, condition.milestoneId == Some(None)) &&
+      (t1.milestoneId.?    isEmpty, condition.milestoneId == Some(None)) &&
-      (t1.assignedUserName is filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
+      (t1.assignedUserName === filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
-      (t1.openedUserName   is filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
+      (t1.openedUserName   === filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
-      (t1.openedUserName   isNot filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
+      (t1.openedUserName   =!= filterUser("not_created_by").bind, filterUser.get("not_created_by").isDefined) &&
-      (t1.pullRequest      is true.bind, onlyPullRequest) &&
+      (t1.pullRequest      === true.bind, onlyPullRequest) &&
       (IssueLabels filter { t2 =>
         (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
         (t2.labelId in

src/main/scala/service/LabelsService.scala

@@ -1,7 +1,8 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.Label
 
 trait LabelsService {
 

src/main/scala/service/MilestonesService.scala

@@ -1,9 +1,10 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.Milestone
 // TODO [Slick 2.0]NOT import directly?
-import model.dateColumnType
+import model.Profile.dateColumnType
 
 trait MilestonesService {
 
@@ -40,7 +41,7 @@ trait MilestonesService {
 
   def getMilestonesWithIssueCount(owner: String, repository: String)(implicit s: Session): List[(Milestone, Int, Int)] = {
     val counts = Issues
-      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId isNotNull) }
+      .filter  { t => (t.byRepository(owner, repository)) && (t.milestoneId.? isDefined) }
       .groupBy { t => t.milestoneId -> t.closed }
       .map     { case (t1, t2) => t1._1 -> t1._2 -> t2.length }
       .toMap

src/main/scala/service/PullRequestService.scala

@@ -1,7 +1,8 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.{PullRequest, Issue}
 
 trait PullRequestService { self: IssuesService =>
   import PullRequestService._
@@ -25,9 +26,9 @@ trait PullRequestService { self: IssuesService =>
     PullRequests
       .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
       .filter { case (t1, t2) =>
-        (t2.closed         is closed.bind) &&
+        (t2.closed         === closed.bind) &&
-        (t1.userName       is owner.get.bind, owner.isDefined) &&
+        (t1.userName       === owner.get.bind, owner.isDefined) &&
-        (t1.repositoryName is repository.get.bind, repository.isDefined)
+        (t1.repositoryName === repository.get.bind, repository.isDefined)
       }
       .groupBy { case (t1, t2) => t2.openedUserName }
       .map { case (userName, t) => userName -> t.length }
@@ -54,10 +55,10 @@ trait PullRequestService { self: IssuesService =>
     PullRequests
       .innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
       .filter { case (t1, t2) =>
-        (t1.requestUserName       is userName.bind) &&
+        (t1.requestUserName       === userName.bind) &&
-        (t1.requestRepositoryName is repositoryName.bind) &&
+        (t1.requestRepositoryName === repositoryName.bind) &&
-        (t1.requestBranch         is branch.bind) &&
+        (t1.requestBranch         === branch.bind) &&
-        (t2.closed                is closed.bind)
+        (t2.closed                === closed.bind)
       }
       .map { case (t1, t2) => t1 }
       .list

src/main/scala/service/RepositorySearchService.scala

@@ -7,8 +7,8 @@ import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
 import org.eclipse.jgit.lib.FileMode
 import org.eclipse.jgit.api.Git
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
 
 trait RepositorySearchService { self: IssuesService =>
   import RepositorySearchService._
@@ -107,7 +107,7 @@ object RepositorySearchService {
 
   case class SearchResult(
     files : List[(String, String)],
-    issues: List[(Issue, Int, String)])
+    issues: List[(model.Issue, Int, String)])
 
   case class IssueSearchResult(
     issueId: Int,

src/main/scala/service/RepositoryService.scala

@@ -1,7 +1,8 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.{Repository, Account, Collaborator}
 import util.JGitUtil
 
 trait RepositoryService { self: AccountService =>
@@ -57,15 +58,15 @@ trait RepositoryService { self: AccountService =>
         val collaborators = Collaborators.filter(_.byRepository(oldUserName, oldRepositoryName)).list
 
         Repositories.filter { t =>
-          (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
+          (t.originUserName === oldUserName.bind) && (t.originRepositoryName === oldRepositoryName.bind)
         }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
 
         Repositories.filter { t =>
-          (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
+          (t.parentUserName === oldUserName.bind) && (t.parentRepositoryName === oldRepositoryName.bind)
         }.map { t => t.originUserName -> t.originRepositoryName }.update(newUserName, newRepositoryName)
 
         PullRequests.filter { t =>
-          t.requestRepositoryName is oldRepositoryName.bind
+          t.requestRepositoryName === oldRepositoryName.bind
         }.map { t => t.requestUserName -> t.requestRepositoryName }.update(newUserName, newRepositoryName)
 
         deleteRepository(oldUserName, oldRepositoryName)
@@ -73,7 +74,16 @@ trait RepositoryService { self: AccountService =>
         WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
-        Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+
+        val newMilestones = Milestones.filter(_.byRepository(newUserName, newRepositoryName)).list
+        Issues.insertAll(issues.map { x => x.copy(
+          userName       = newUserName,
+          repositoryName = newRepositoryName,
+          milestoneId    = x.milestoneId.map { id =>
+            newMilestones.find(_.title == milestones.find(_.milestoneId == id).get.title).get.milestoneId
+          }
+        )} :_*)
+
         PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
         Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
@@ -92,7 +102,7 @@ trait RepositoryService { self: AccountService =>
         }.map { t => t.activityId -> t.message }.list
 
         updateActivities.foreach { case (activityId, message) =>
-          Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+          Activities.filter(_.activityId === activityId.bind).map(_.message).update(
             message
               .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
               .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
@@ -126,7 +136,7 @@ trait RepositoryService { self: AccountService =>
    * @return the list of repository names
    */
   def getRepositoryNamesOfUser(userName: String)(implicit s: Session): List[String] =
-    Repositories filter(_.userName is userName.bind) map (_.repositoryName) list
+    Repositories filter(_.userName === userName.bind) map (_.repositoryName) list
 
   /**
    * Returns the specified repository information.
@@ -140,7 +150,7 @@ trait RepositoryService { self: AccountService =>
     (Repositories filter { t => t.byRepository(userName, repositoryName) } firstOption) map { repository =>
       // for getting issue count and pull request count
       val issues = Issues.filter { t =>
-        t.byRepository(repository.userName, repository.repositoryName) && (t.closed is false.bind)
+        t.byRepository(repository.userName, repository.repositoryName) && (t.closed === false.bind)
       }.map(_.pullRequest).list
 
       new RepositoryInfo(
@@ -156,11 +166,17 @@ trait RepositoryService { self: AccountService =>
     }
   }
 
+  def getAllRepositories()(implicit s: Session): List[(String, String)] = {
+    Repositories.sortBy(_.lastActivityDate desc).map{ t =>
+      (t.userName, t.repositoryName)
+    }.list
+  }
+
   def getUserRepositories(userName: String, baseUrl: String, withoutPhysicalInfo: Boolean = false)
                          (implicit s: Session): List[RepositoryInfo] = {
     Repositories.filter { t1 =>
-      (t1.userName is userName.bind) ||
+      (t1.userName === userName.bind) ||
-        (Collaborators.filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName is userName.bind)} exists)
+        (Collaborators.filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName === userName.bind)} exists)
     }.sortBy(_.lastActivityDate desc).list.map{ repository =>
       new RepositoryInfo(
         if(withoutPhysicalInfo){
@@ -196,13 +212,13 @@ trait RepositoryService { self: AccountService =>
       case Some(x) if(x.isAdmin) => Repositories
       // for Normal Users
       case Some(x) if(!x.isAdmin) =>
-        Repositories filter { t => (t.isPrivate is false.bind) || (t.userName is x.userName) ||
+        Repositories filter { t => (t.isPrivate === false.bind) || (t.userName === x.userName) ||
-          (Collaborators.filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)} exists)
+          (Collaborators.filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName === x.userName.bind)} exists)
         }
       // for Guests
-      case None => Repositories filter(_.isPrivate is false.bind)
+      case None => Repositories filter(_.isPrivate === false.bind)
     }).filter { t =>
-      repositoryUserName.map { userName => t.userName is userName.bind } getOrElse LiteralColumn(true)
+      repositoryUserName.map { userName => t.userName === userName.bind } getOrElse LiteralColumn(true)
     }.sortBy(_.lastActivityDate desc).list.map{ repository =>
       new RepositoryInfo(
         if(withoutPhysicalInfo){
@@ -290,15 +306,14 @@ trait RepositoryService { self: AccountService =>
   }
 
   private def getForkedCount(userName: String, repositoryName: String)(implicit s: Session): Int =
-    // TODO check SQL
     Query(Repositories.filter { t =>
-      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
     }.length).first
 
 
   def getForkedRepositories(userName: String, repositoryName: String)(implicit s: Session): List[(String, String)] =
     Repositories.filter { t =>
-      (t.originUserName is userName.bind) && (t.originRepositoryName is repositoryName.bind)
+      (t.originUserName === userName.bind) && (t.originRepositoryName === repositoryName.bind)
     }
     .sortBy(_.userName asc).map(t => t.userName -> t.repositoryName).list
 

src/main/scala/service/RequestCache.scala

@@ -1,7 +1,6 @@
 package service
 
-import model._
+import model.{Account, Issue, Session}
-import slick.jdbc.JdbcBackend
 import util.Implicits.request2Session
 
 /**
@@ -12,7 +11,7 @@ import util.Implicits.request2Session
  */
 trait RequestCache extends SystemSettingsService with AccountService with IssuesService {
 
-  private implicit def context2Session(implicit context: app.Context): JdbcBackend#Session =
+  private implicit def context2Session(implicit context: app.Context): Session =
     request2Session(context.request)
 
   def getIssue(userName: String, repositoryName: String, issueId: String)

src/main/scala/service/SshKeyService.scala

@@ -1,7 +1,8 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.SshKey
 
 trait SshKeyService {
 
@@ -9,7 +10,7 @@ trait SshKeyService {
     SshKeys insert SshKey(userName = userName, title = title, publicKey = publicKey)
 
   def getPublicKeys(userName: String)(implicit s: Session): List[SshKey] =
-    SshKeys.filter(_.userName is userName.bind).sortBy(_.sshKeyId).list
+    SshKeys.filter(_.userName === userName.bind).sortBy(_.sshKeyId).list
 
   def deletePublicKey(userName: String, sshKeyId: Int)(implicit s: Session): Unit =
     SshKeys filter (_.byPrimaryKey(userName, sshKeyId)) delete

src/main/scala/service/SystemSettingsService.scala

@@ -37,8 +37,9 @@ trait SystemSettingsService {
           ldap.bindPassword.foreach(x => props.setProperty(LdapBindPassword, x))
           props.setProperty(LdapBaseDN, ldap.baseDN)
           props.setProperty(LdapUserNameAttribute, ldap.userNameAttribute)
+          ldap.additionalFilterCondition.foreach(x => props.setProperty(LdapAdditionalFilterCondition, x))
           ldap.fullNameAttribute.foreach(x => props.setProperty(LdapFullNameAttribute, x))
-          props.setProperty(LdapMailAddressAttribute, ldap.mailAttribute)
+          ldap.mailAttribute.foreach(x => props.setProperty(LdapMailAddressAttribute, x.toString))
           ldap.tls.foreach(x => props.setProperty(LdapTls, x.toString))
           ldap.keystore.foreach(x => props.setProperty(LdapKeystore, x))
         }
@@ -85,8 +86,9 @@ trait SystemSettingsService {
             getOptionValue(props, LdapBindPassword, None),
             getValue(props, LdapBaseDN, ""),
             getValue(props, LdapUserNameAttribute, ""),
+            getOptionValue(props, LdapAdditionalFilterCondition, None),
             getOptionValue(props, LdapFullNameAttribute, None),
-            getValue(props, LdapMailAddressAttribute, ""),
+            getOptionValue(props, LdapMailAddressAttribute, None),
             getOptionValue[Boolean](props, LdapTls, None),
             getOptionValue(props, LdapKeystore, None)))
         } else {
@@ -125,8 +127,9 @@ object SystemSettingsService {
     bindPassword: Option[String],
     baseDN: String,
     userNameAttribute: String,
+    additionalFilterCondition: Option[String],
     fullNameAttribute: Option[String],
-    mailAttribute: String,
+    mailAttribute: Option[String],
     tls: Option[Boolean],
     keystore: Option[String])
 
@@ -163,6 +166,7 @@ object SystemSettingsService {
   private val LdapBindPassword = "ldap.bind_password"
   private val LdapBaseDN = "ldap.baseDN"
   private val LdapUserNameAttribute = "ldap.username_attribute"
+  private val LdapAdditionalFilterCondition = "ldap.additional_filter_condition"
   private val LdapFullNameAttribute = "ldap.fullname_attribute"
   private val LdapMailAddressAttribute = "ldap.mail_attribute"
   private val LdapTls = "ldap.tls"

src/main/scala/service/WebHookService.scala

@@ -1,7 +1,8 @@
 package service
 
-import model._
+import model.Profile._
-import simple._
+import profile.simple._
+import model.{WebHook, Account}
 import org.slf4j.LoggerFactory
 import service.RepositoryService.RepositoryInfo
 import util.JGitUtil
@@ -43,7 +44,7 @@ trait WebHookService {
       val httpClient = HttpClientBuilder.create.build
 
       webHookURLs.foreach { webHookUrl =>
-        val f = future {
+        val f = Future {
           logger.debug(s"start web hook invocation for ${webHookUrl}")
           val httpPost = new HttpPost(webHookUrl.url)
 
@@ -89,15 +90,15 @@ object WebHookService {
           WebHookCommit(
             id        = commit.id,
             message   = commit.fullMessage,
-            timestamp = commit.time.toString,
+            timestamp = commit.commitTime.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,
+              name  = commit.committerName,
-              email = commit.mailAddress
+              email = commit.committerEmailAddress
             )
           )
         },

src/main/scala/service/WikiService.scala

@@ -64,7 +64,7 @@ trait WikiService {
       if(!JGitUtil.isEmpty(git)){
         JGitUtil.getFileList(git, "master", ".").find(_.name == pageName + ".md").map { file =>
           WikiPageInfo(file.name, StringUtil.convertFromByteArray(git.getRepository.open(file.id).getBytes),
-                       file.committer, file.time, file.commitId)
+                       file.author, file.time, file.commitId)
         }
       } else None
     }

src/main/scala/servlet/AutoUpdateListener.scala

@@ -52,6 +52,7 @@ object AutoUpdate {
    * The history of versions. A head of this sequence is the current BitBucket version.
    */
   val versions = Seq(
+    new Version(2, 2),
     new Version(2, 1),
     new Version(2, 0){
       override def update(conn: Connection): Unit = {

src/main/scala/servlet/BasicAuthenticationFilter.scala

@@ -5,7 +5,6 @@ import javax.servlet.http._
 import service.{SystemSettingsService, AccountService, RepositoryService}
 import model._
 import org.slf4j.LoggerFactory
-import slick.jdbc.JdbcBackend
 import util.Implicits._
 import util.ControlUtil._
 import util.Keys
@@ -67,7 +66,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
   }
 
   private def getWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo)
-                             (implicit session: JdbcBackend#Session): Option[Account] =
+                             (implicit session: Session): Option[Account] =
     authenticate(loadSystemSettings(), username, password) match {
       case x @ Some(account) if(hasWritePermission(repository.owner, repository.name, x)) => x
       case _ => None

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -17,7 +17,7 @@ import WebHookService._
 import org.eclipse.jgit.api.Git
 import util.JGitUtil.CommitInfo
 import service.IssuesService.IssueSearchCondition
-import slick.jdbc.JdbcBackend
+import model.Session
 
 /**
  * Provides Git repository via HTTP.
@@ -95,7 +95,7 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
 
 import scala.collection.JavaConverters._
 
-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)(implicit session: JdbcBackend#Session)
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String)(implicit session: Session)
   extends PostReceiveHook with PreReceiveHook
   with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
   
@@ -205,7 +205,7 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
   private def createIssueComment(commit: CommitInfo) = {
     StringUtil.extractIssueId(commit.fullMessage).foreach { issueId =>
       if(getIssue(owner, repository, issueId).isDefined){
-        getAccountByMailAddress(commit.mailAddress).foreach { account =>
+        getAccountByMailAddress(commit.committerEmailAddress).foreach { account =>
           createComment(owner, repository, account.userName, issueId.toInt, commit.fullMessage + " " + commit.id, "commit")
         }
       }

src/main/scala/servlet/PluginActionInvokeFilter.scala

@@ -5,8 +5,11 @@ import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import org.apache.commons.io.IOUtils
 import twirl.api.Html
 import service.{AccountService, RepositoryService, SystemSettingsService}
-import model.Account
+import model.{Account, Session}
 import util.{JGitUtil, Keys}
+import plugin.PluginConnectionHolder
+import service.RepositoryService.RepositoryInfo
+import service.SystemSettingsService.SystemSettings
 
 class PluginActionInvokeFilter extends Filter with SystemSettingsService with RepositoryService with AccountService {
 
@@ -30,18 +33,14 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
   private def processGlobalAction(path: String, request: HttpServletRequest, response: HttpServletResponse): Boolean = {
     plugin.PluginSystem.globalActions.find(_.path == path).map { action =>
       val result = action.function(request, response)
+      val systemSettings = loadSystemSettings()
       result match {
-        case x: String => {
+        case x: String => renderGlobalHtml(request, response, systemSettings, x)
-          response.setContentType("text/html; charset=UTF-8")
+        case x: org.mozilla.javascript.NativeObject => {
-          val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+          x.get("format") match {
-          implicit val context = app.Context(loadSystemSettings(), Option(loginAccount), request)
+            case "html" => renderGlobalHtml(request, response, systemSettings, x.get("body").toString)
-          val html = _root_.html.main("GitBucket", None)(Html(x))
+            case "json" => renderJson(request, response, x.get("body").toString)
-          IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
           }
-        case x => {
-          // TODO returns as JSON?
-          response.setContentType("application/json; charset=UTF-8")
-
         }
       }
       true
@@ -49,27 +48,28 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
   }
 
   private def processRepositoryAction(path: String, request: HttpServletRequest, response: HttpServletResponse)
-                                     (implicit session: model.simple.Session): Boolean = {
+                                     (implicit session: Session): Boolean = {
     val elements = path.split("/")
     if(elements.length > 3){
       val owner  = elements(1)
       val name   = elements(2)
       val remain = elements.drop(3).mkString("/", "/", "")
-      getRepository(owner, name, "").flatMap { repository => // TODO fill baseUrl
+      val systemSettings = loadSystemSettings()
+      getRepository(owner, name, systemSettings.baseUrl(request)).flatMap { repository =>
         plugin.PluginSystem.repositoryActions.find(_.path == remain).map { action =>
-          val result = action.function(request, response)
+          val result = try {
-          result match {
+            PluginConnectionHolder.threadLocal.set(session.conn)
-            case x: String => {
+            action.function(request, response, repository)
-              response.setContentType("text/html; charset=UTF-8")
+          } finally {
-              val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+            PluginConnectionHolder.threadLocal.remove()
-              implicit val context = app.Context(loadSystemSettings(), Option(loginAccount), request)
+          }
-              val html = _root_.html.main("GitBucket", None)(_root_.html.menu("", repository)(Html(x))) // TODO specify active side menu
+          result match {
-              IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+            case x: String => renderRepositoryHtml(request, response, systemSettings, repository, x)
+            case x: org.mozilla.javascript.NativeObject => {
+              x.get("format") match {
+                case "html" => renderRepositoryHtml(request, response, systemSettings, repository, x.get("body").toString)
+                case "json" => renderJson(request, response, x.get("body").toString)
               }
-            case x => {
-              // TODO returns as JSON?
-              response.setContentType("application/json; charset=UTF-8")
-
             }
           }
           true
@@ -78,4 +78,27 @@ class PluginActionInvokeFilter extends Filter with SystemSettingsService with Re
     } else false
   }
 
+  private def renderGlobalHtml(request: HttpServletRequest, response: HttpServletResponse,
+                               systemSettings: SystemSettings, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+    implicit val context = app.Context(systemSettings, Option(loginAccount), request)
+    val html = _root_.html.main("GitBucket", None)(Html(body))
+    IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderRepositoryHtml(request: HttpServletRequest, response: HttpServletResponse,
+                                   systemSettings: SystemSettings, repository: RepositoryInfo, body: String): Unit = {
+    response.setContentType("text/html; charset=UTF-8")
+    val loginAccount = request.getSession.getAttribute(Keys.Session.LoginAccount).asInstanceOf[Account]
+    implicit val context = app.Context(systemSettings, Option(loginAccount), request)
+    val html = _root_.html.main("GitBucket", None)(_root_.html.menu("", repository)(Html(body))) // TODO specify active side menu
+    IOUtils.write(html.toString.getBytes("UTF-8"), response.getOutputStream)
+  }
+
+  private def renderJson(request: HttpServletRequest, response: HttpServletResponse, body: String): Unit = {
+    response.setContentType("application/json; charset=UTF-8")
+    IOUtils.write(body.getBytes("UTF-8"), response.getOutputStream)
+  }
+
 }

src/main/scala/ssh/GitCommand.scala

@@ -12,7 +12,7 @@ import servlet.{Database, CommitLogHook}
 import service.{AccountService, RepositoryService, SystemSettingsService}
 import org.eclipse.jgit.errors.RepositoryNotFoundException
 import javax.servlet.ServletContext
-import model.profile.simple.Session
+import model.Session
 
 object GitCommand {
   val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
@@ -31,7 +31,7 @@ abstract class GitCommand(val context: ServletContext, val owner: String, val re
 
   private def newTask(user: String): Runnable = new Runnable {
     override def run(): Unit = {
-      Database(context) withTransaction { implicit session =>
+      Database(context) withSession { implicit session =>
         try {
           runTask(user)
           callback.onExit(0)

src/main/scala/ssh/PublicKeyAuthenticator.scala

@@ -10,7 +10,7 @@ import javax.servlet.ServletContext
 class PublicKeyAuthenticator(context: ServletContext) extends PublickeyAuthenticator with SshKeyService {
 
   override def authenticate(username: String, key: PublicKey, session: ServerSession): Boolean = {
-    Database(context) withTransaction { implicit session =>
+    Database(context) withSession { implicit session =>
       getPublicKeys(username).exists { sshKey =>
         SshUtil.str2PublicKey(sshKey.publicKey) match {
           case Some(publicKey) => key.equals(publicKey)

src/main/scala/util/JGitUtil.scala

@@ -47,38 +47,45 @@ object JGitUtil {
    * @param id the object id
    * @param isDirectory whether is it directory
    * @param name the file (or directory) name
-   * @param time the last modified time
    * @param message the last commit message
    * @param commitId the last commit id
-   * @param committer the last committer name
+   * @param time the last modified time
+   * @param author the last committer name
    * @param mailAddress the committer's mail address
    * @param linkUrl the url of submodule
    */
-  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, time: Date, message: String, commitId: String,
+  case class FileInfo(id: ObjectId, isDirectory: Boolean, name: String, message: String, commitId: String,
-                      committer: String, mailAddress: String, linkUrl: Option[String])
+                      time: Date, author: String, mailAddress: String, linkUrl: Option[String])
 
   /**
    * The commit data.
    *
    * @param id the commit id
-   * @param time the commit time
-   * @param committer  the committer name
-   * @param mailAddress the mail address of the committer
    * @param shortMessage the short message
    * @param fullMessage the full message
    * @param parents the list of parent commit id
+   * @param authorTime the author time
+   * @param authorName the author name
+   * @param authorEmailAddress the mail address of the author
+   * @param commitTime the commit time
+   * @param committerName  the committer name
+   * @param committerEmailAddress the mail address of the committer
    */
-  case class CommitInfo(id: String, time: Date, committer: String, mailAddress: String,
+  case class CommitInfo(id: String, shortMessage: String, fullMessage: String, parents: List[String],
-                        shortMessage: String, fullMessage: String, parents: List[String]){
+                        authorTime: Date, authorName: String, authorEmailAddress: String,
+                        commitTime: Date, committerName: String, committerEmailAddress: String){
     
     def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
         rev.getName,
-        rev.getCommitterIdent.getWhen,
-        rev.getCommitterIdent.getName,
-        rev.getCommitterIdent.getEmailAddress,
         rev.getShortMessage,
         rev.getFullMessage,
-        rev.getParents().map(_.name).toList)
+        rev.getParents().map(_.name).toList,
+        rev.getAuthorIdent.getWhen,
+        rev.getAuthorIdent.getName,
+        rev.getAuthorIdent.getEmailAddress,
+        rev.getCommitterIdent.getWhen,
+        rev.getCommitterIdent.getName,
+        rev.getCommitterIdent.getEmailAddress)
 
     val summary = getSummaryMessage(fullMessage, shortMessage)
 
@@ -87,6 +94,8 @@ object JGitUtil {
         Some(fullMessage.trim.substring(i).trim)
       } else None
     }
+
+    def isDifferentFromAuthor: Boolean = authorName != committerName || authorEmailAddress != committerEmailAddress
   }
 
   case class DiffInfo(changeType: ChangeType, oldPath: String, newPath: String, oldContent: Option[String], newContent: Option[String])
@@ -98,7 +107,12 @@ object JGitUtil {
    * @param content the string content
    * @param charset the character encoding
    */
-  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String])
+  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String]){
+    /**
+     * the line separator of this content ("LF" or "CRLF")
+     */
+    val lineSeparator: String = if(content.exists(_.indexOf("\r\n") >= 0)) "CRLF" else "LF"
+  }
 
   /**
    * The tag data.
@@ -226,11 +240,11 @@ object JGitUtil {
           objectId,
           fileMode == FileMode.TREE || fileMode == FileMode.GITLINK,
           name,
-          commit.getCommitterIdent.getWhen,
           getSummaryMessage(commit.getFullMessage, commit.getShortMessage),
           commit.getName,
-          commit.getCommitterIdent.getName,
+          commit.getAuthorIdent.getWhen,
-          commit.getCommitterIdent.getEmailAddress,
+          commit.getAuthorIdent.getName,
+          commit.getAuthorIdent.getEmailAddress,
           linkUrl)
       }
     }.sortWith { (file1, file2) =>

src/main/scala/util/LDAPUtil.scala

@@ -7,6 +7,7 @@ import java.security.Security
 import org.slf4j.LoggerFactory
 import service.SystemSettingsService.Ldap
 import scala.annotation.tailrec
+import model.Account
 
 /**
  * Utility for LDAP authentication.
@@ -16,6 +17,26 @@ object LDAPUtil {
   private val LDAP_VERSION: Int = LDAPConnection.LDAP_V3
   private val logger = LoggerFactory.getLogger(getClass().getName())
 
+  private val LDAP_DUMMY_MAL = "@ldap-devnull"
+
+  /**
+   * Returns true if mail address ends with "@ldap-devnull"
+   */
+  def isDummyMailAddress(account: Account): Boolean = {
+    account.mailAddress.endsWith(LDAP_DUMMY_MAL)
+  }
+
+  /**
+   * Creates dummy address (userName@ldap-devnull) for LDAP login.
+   *
+   * If  mail address is not managed in LDAP server, GitBucket stores this dummy address in first LDAP login.
+   * GitBucket does not send any mails to this dummy address. And these users must input their mail address
+   * at the first step after LDAP authentication.
+   */
+  def createDummyMailAddress(userName: String): String = {
+    userName + LDAP_DUMMY_MAL
+  }
+
   /**
    * Try authentication by LDAP using given configuration.
    * Returns Right(LDAPUserInfo) if authentication is successful, otherwise  Left(errorMessage).
@@ -30,7 +51,7 @@ object LDAPUtil {
       keystore = ldapSettings.keystore.getOrElse(""),
       error    = "System LDAP authentication failed."
     ){ conn =>
-      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute) match {
+      findUser(conn, userName, ldapSettings.baseDN, ldapSettings.userNameAttribute, ldapSettings.additionalFilterCondition) match {
         case Some(userDN) => userAuthentication(ldapSettings, userDN, userName, password)
         case None         => Left("User does not exist.")
       }
@@ -47,7 +68,15 @@ object LDAPUtil {
       keystore = ldapSettings.keystore.getOrElse(""),
       error    = "User LDAP Authentication Failed."
     ){ conn =>
-      findMailAddress(conn, userDN, ldapSettings.userNameAttribute, userName, ldapSettings.mailAttribute) match {
+      if(ldapSettings.mailAttribute.getOrElse("").isEmpty) {
+        Right(LDAPUserInfo(
+          userName    = userName,
+          fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
+            findFullName(conn, userDN, ldapSettings.userNameAttribute, userName, fullNameAttribute)
+          }.getOrElse(userName),
+          mailAddress = createDummyMailAddress(userName)))
+      } else {
+        findMailAddress(conn, userDN, ldapSettings.userNameAttribute, userName, ldapSettings.mailAttribute.get) match {
           case Some(mailAddress) => Right(LDAPUserInfo(
             userName    = getUserNameFromMailAddress(userName),
             fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
@@ -58,6 +87,7 @@ object LDAPUtil {
         }
       }
     }
+  }
 
   private def getUserNameFromMailAddress(userName: String): String = {
     (userName.indexOf('@') match {
@@ -112,7 +142,7 @@ object LDAPUtil {
   /**
    * Search a specified user and returns userDN if exists.
    */
-  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String): Option[String] = {
+  private def findUser(conn: LDAPConnection, userName: String, baseDN: String, userNameAttribute: String, additionalFilterCondition: Option[String]): Option[String] = {
     @tailrec
     def getEntries(results: LDAPSearchResults, entries: List[Option[LDAPEntry]] = Nil): List[LDAPEntry] = {
       if(results.hasMore){
@@ -125,7 +155,13 @@ object LDAPUtil {
         entries.flatten
       }
     }
-    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, userNameAttribute + "=" + userName, null, false)).collectFirst {
+
+    val filterCond = additionalFilterCondition.getOrElse("") match {
+      case "" => userNameAttribute + "=" + userName
+      case x => "(&(" + x + ")(" + userNameAttribute + "=" + userName + "))"
+    }
+
+    getEntries(conn.search(baseDN, LDAPConnection.SCOPE_SUB, filterCond, null, false)).collectFirst {
       case x => x.getDN
     }
   }

src/main/scala/util/Notifier.scala

@@ -6,11 +6,11 @@ import org.apache.commons.mail.{DefaultAuthenticator, HtmlEmail}
 import org.slf4j.LoggerFactory
 
 import app.Context
+import model.Session
 import service.{AccountService, RepositoryService, IssuesService, SystemSettingsService}
 import servlet.Database
 import SystemSettingsService.Smtp
 import _root_.util.ControlUtil.defining
-import model.profile.simple.Session
 
 trait Notifier extends RepositoryService with AccountService with IssuesService {
   def toNotify(r: RepositoryService.RepositoryInfo, issueId: Int, content: String)
@@ -28,7 +28,7 @@ trait Notifier extends RepositoryService with AccountService with IssuesService
     )
     .distinct
     .withFilter ( _ != context.loginAccount.get.userName )	// the operation in person is excluded
-    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) foreach (x => notify(x.mailAddress)) )
+    .foreach ( getAccountByUserName(_) filterNot (_.isGroupAccount) filterNot (LDAPUtil.isDummyMailAddress(_)) foreach (x => notify(x.mailAddress)) )
 
 }
 
@@ -69,8 +69,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
       (msg: String => String)(implicit context: Context) = {
     val database = Database(context.request.getServletContext)
 
-    val f = future {
+    val f = Future {
-      // TODO Can we use the Database Session in other than Transaction Filter?
       database withSession { implicit session =>
         getIssue(r.owner, r.name, issueId.toString) foreach { issue =>
           defining(

src/main/scala/util/StringUtil.scala

@@ -46,6 +46,22 @@ object StringUtil {
       }
     }
 
+  /**
+   * Converts line separator in the given content.
+   *
+   * @param content the content
+   * @param lineSeparator "LF" or "CRLF"
+   * @return the converted content
+   */
+  def convertLineSeparator(content: String, lineSeparator: String): String = {
+    val lf = content.replace("\r\n", "\n").replace("\r", "\n")
+    if(lineSeparator == "CRLF"){
+      lf.replace("\n", "\r\n")
+    } else {
+      lf
+    }
+  }
+
   /**
    * Extract issue id like ```#issueId``` from the given message.
    *

src/main/scala/view/helpers.scala

@@ -74,7 +74,7 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
    * This method looks up Gravatar if avatar icon has not been configured in user settings.
    */
   def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
-    getAvatarImageHtml(commit.committer, size, commit.mailAddress)
+    getAvatarImageHtml(commit.authorName, size, commit.authorEmailAddress)
 
   /**
    * Converts commit id, issue id and username to the link.

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

@@ -1,6 +1,7 @@
 @(account: model.Account, info: Option[Any])(implicit context: app.Context)
 @import context._
 @import view.helpers._
+@import util.LDAPUtil
 @html.main("Edit your profile"){
 <div class="container">
   <div class="row-fluid">
@@ -9,6 +10,7 @@
     </div>
     <div class="span9">
       @helper.html.information(info)
+      @if(LDAPUtil.isDummyMailAddress(account)){<div class="alert alert-danger">Please register your mail address.</div>}
       <form action="@url(account.userName)/_edit" method="POST" validate="true">
       <div class="box">
         <div class="box-header">Profile</div>
@@ -31,7 +33,7 @@
               </fieldset>
               <fieldset>
                 <label for="mailAddress" class="strong">Mail Address:</label>
-                <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
+                <input type="text" name="mailAddress" id="mailAddress" value="@if(!LDAPUtil.isDummyMailAddress(account)){@account.mailAddress}"/>
                 <span id="error-mailAddress" class="error"></span>
               </fieldset>
               <fieldset>
@@ -52,7 +54,7 @@
               <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
             </div>
             <input type="submit" class="btn btn-success" value="Save"/>
-            <a href="@url(account.userName)" class="btn">Cancel</a>
+            @if(!LDAPUtil.isDummyMailAddress(account)){<a href="@url(account.userName)" class="btn">Cancel</a>}
           </div>
         </div>
       </div>

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

@@ -60,7 +60,7 @@ $(function(){
   });
 
   $('#addMember').click(function(){
-    $('#error-memberName').text('');
+    $('#error-members').text('');
     var userName = $('#memberName').val();
 
     // check empty
@@ -73,18 +73,18 @@ $(function(){
       return $(this).data('name') == userName;
     }).length > 0;
     if(exists){
-      $('#error-memberName').text('User has been already added.');
+      $('#error-members').text('User has been already added.');
       return false;
     }
 
     // check existence
-    $.post('@path/admin/users/_usercheck', {
+    $.post('@path/_user/existence', {
       'userName': userName
     }, function(data, status){
       if(data == 'true'){
         addMemberHTML(userName, false);
       } else {
-        $('#error-memberName').text('User does not exist.');
+        $('#error-members').text('User does not exist.');
       }
     });
   });

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

@@ -8,7 +8,7 @@
       <div class="row-fluid">
         <div class="span4">
           <div class="block">
-            <div class="account-image">@avatar(account.userName, 200)</div>
+            <div class="account-image">@avatar(account.userName, 270)</div>
             <div class="account-fullname">@account.fullName</div>
             <div class="account-username">@account.userName</div>
           </div>

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

@@ -133,6 +133,13 @@
                 <span id="error-ldap_userNameAttribute" class="error"></span>
               </div>
             </div>
+            <div class="control-group">
+              <label class="control-label" for="ldapAdditionalFilterCondition">Additional filter condition</label>
+              <div class="controls">
+                <input type="text" id="ldapAdditionalFilterCondition" name="ldap.additionalFilterCondition" value="@settings.ldap.map(_.additionalFilterCondition)"/>
+                <span id="error-ldap_additionalFilterCondition" class="error"></span>
+              </div>
+            </div>
             <div class="control-group">
               <label class="control-label" for="ldapFullNameAttribute">Full name attribute</label>
               <div class="controls">

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

@@ -59,7 +59,7 @@ $(function(){
   });
 
   $('#addMember').click(function(){
-    $('#error-memberName').text('');
+    $('#error-members').text('');
     var userName = $('#memberName').val();
 
     // check empty
@@ -72,18 +72,18 @@ $(function(){
       return $(this).data('name') == userName;
     }).length > 0;
     if(exists){
-      $('#error-memberName').text('User has been already added.');
+      $('#error-members').text('User has been already added.');
       return false;
     }
 
     // check existence
-    $.post('@path/admin/users/_usercheck', {
+    $.post('@path/_user/existence', {
       'userName': userName
     }, function(data, status){
       if(data == 'true'){
         addMemberHTML(userName, false);
       } else {
-        $('#error-memberName').text('User does not exist.');
+        $('#error-members').text('User does not exist.');
       }
     });
   });

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

@@ -22,7 +22,7 @@
         case "fork"              => simpleActivity(activity, "activity-fork.png")
         case "push"  => customActivity(activity, "activity-commit.png"){
           <div class="small activity-message">
-            {activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
+            {activity.additionalInfo.get.split("\n").reverse.filter(_ matches "[0-9a-z]{40}:.*").take(4).zipWithIndex.map{ case (commit, i) =>
               if(i == 3){
                 <div>...</div>
               } else {

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

@@ -24,6 +24,7 @@
   });
   var title = $('#@id').attr('title');
   $('#@id').removeAttr('title')
+  clip.htmlBridge = "#global-zeroclipboard-html-bridge";
   clip.on('complete', function(client, args) {
     $(clip.htmlBridge).attr('title', 'copied!').tooltip('fixTitle').tooltip('show');
     $(clip.htmlBridge).attr('title', title).tooltip('fixTitle');

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

@@ -11,11 +11,13 @@
 <script>
 $(function(){
   var callback = function(data){
+    $('#update-comment-@commentId, #cancel-comment-@commentId').removeAttr('disabled');
     $('#commentContent-@commentId').empty().html(data.content);
     prettyPrint();
   };
 
   $('#update-comment-@commentId').click(function(){
+    $('#update-comment-@commentId, #cancel-comment-@commentId').attr('disabled', 'disabled');
     $.ajax({
       url: '@path/@owner/@repository/issue_comments/edit/@commentId',
       type: 'POST',
@@ -26,11 +28,13 @@ $(function(){
     }).done(
       callback
     ).fail(function(req) {
+      $('#update-comment-@commentId, #cancel-comment-@commentId').removeAttr('disabled');
       $('#error-edit-content-@commentId').text($.parseJSON(req.responseText).content);
     });
   });
 
   $('#cancel-comment-@commentId').click(function(){
+    $('#update-comment-@commentId, #cancel-comment-@commentId').attr('disabled', 'disabled');
     $.get('@path/@owner/@repository/issue_comments/_data/@commentId', callback);
     return false;
   });

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

@@ -14,11 +14,13 @@ $(function(){
   $('#edit-content').elastic();
 
   var callback = function(data){
+    $('#update, #cancel').removeAttr('disabled');
     $('#issueTitle').empty().text(data.title);
     $('#issueContent').empty().html(data.content);
   };
 
   $('#update').click(function(){
+    $('#update, #cancel').attr('disabled', 'disabled');
     $.ajax({
       url: '@path/@owner/@repository/issues/edit/@issueId',
       type: 'POST',
@@ -29,11 +31,13 @@ $(function(){
     }).done(
       callback
     ).fail(function(req) {
+      $('#update, #cancel').removeAttr('disabled');
       $('#error-edit-title').text($.parseJSON(req.responseText).title);
     });
   });
 
   $('#cancel').click(function(){
+    $('#update, #cancel').attr('disabled', 'disabled');
     $.get('@path/@owner/@repository/issues/_data/@issueId', callback);
     return false;
   });

src/main/twirl/menu.scala.html

@@ -87,6 +87,9 @@
         <div style="margin-top: 10px;">
           <a href="@{url(repository)}/archive/@{encodeRefName(id)}.zip" class="btn btn-small" style="width: 147px;"><i class="icon-download-alt"></i>Download ZIP</a>
         </div>
+        <div style="margin-top: 10px;">
+          <a href="@{url(repository)}/archive/@{encodeRefName(id)}.tar.gz" class="btn btn-small" style="width: 147px;"><i class="icon-download-alt"></i>Download TAR.GZ</a>
+        </div>
       }
     }
   </div>

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

@@ -6,13 +6,13 @@
   <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>
+        <th colspan="3" class="box-header" style="font-weight: normal;">@date(day.head.commitTime)</th>
       </tr>
       @day.map { commit =>
         <tr>
           <td style="width: 20%;">
             @avatar(commit, 20)
-            @user(commit.committer, commit.mailAddress, "username")
+            @user(commit.authorName, commit.authorEmailAddress, "username")
           </td>
           <td>@commit.shortMessage</td>
           <td style="width: 10%; text-align: right;">

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

@@ -42,7 +42,7 @@
         pullreq.repositoryName == pullreq.requestRepositoryName && repository.branchList.contains(pullreq.requestBranch)){
         <div class="box issue-comment-box" style="background-color: #d0eeff;">
           <div class="box-content"class="issue-content" style="border: 1px solid #87a8c9; padding: 10px;">
-            <a href="@url(repository)/pull/@issue.issueId/delete/@pullreq.requestBranch" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
+            <a href="@url(repository)/pull/@issue.issueId/delete/@encodeRefName(pullreq.requestBranch)" class="btn btn-info pull-right delete-branch" data-name="@pullreq.requestBranch">Delete branch</a>
             <div>
               <span class="strong">Pull request successfully merged and closed</span>
             </div>

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

@@ -42,7 +42,7 @@
     <p>
       <span class="strong">Step 1:</span> 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 =>
+    @defining(s"git checkout -b ${pullreq.requestUserName}-${pullreq.requestBranch} ${pullreq.branch}"){ command =>
       @helper.html.copy("merge-command-copy-1", command){
         <pre style="width: 500px; float: left;">@command</pre>
       }
@@ -62,7 +62,7 @@
     <p>
       <span class="strong">Step 3:</span> 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 =>
+    @defining(s"git checkout master\ngit merge ${pullreq.requestUserName}-${pullreq.requestBranch}\ngit push origin ${pullreq.branch}"){ command =>
       @helper.html.copy("merge-command-copy-3", command){
         <pre style="width: 500px; float: left;">@command</pre>
       }

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

@@ -33,8 +33,8 @@
         <th style="font-weight: normal;">
           <div class="pull-left">
             @avatar(latestCommit, 20)
-            @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
+            @user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")
-            <span class="muted">@datetime(latestCommit.time)</span>
+            <span class="muted">@datetime(latestCommit.commitTime)</span>
             <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
           </div>
           <div class="btn-group pull-right">

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

@@ -31,7 +31,10 @@
               <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branchName)}">to @{repository.repository.defaultBranch}</a>
             }
           </td>
-          <td><a href="@url(repository)/archive/@{encodeRefName(branchName)}.zip">ZIP</a></td>
+          <td>
+            <a href="@url(repository)/archive/@{encodeRefName(branchName)}.zip">ZIP</a>
+            <a href="@url(repository)/archive/@{encodeRefName(branchName)}.tar.gz">TAR.GZ</a>
+          </td>
         </tr>
       }
     </table>

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

@@ -42,9 +42,6 @@
       </tr>
       <tr>
         <td>
-          @avatar(commit, 20)
-          @user(commit.committer, commit.mailAddress, "username strong")
-          <span class="muted">@datetime(commit.time)</span>
           <div class="pull-right monospace small" style="text-align: right;">
             <div>
               @if(commit.parents.size == 0){
@@ -66,6 +63,21 @@
               </div>
             }
           </div>
+
+          <div class="author-info">
+            <div class="author">
+              @avatar(commit, 20)
+              <span>@user(commit.authorName, commit.authorEmailAddress, "username strong")</span>
+              <span class="muted">authored on @datetime(commit.authorTime)</span>
+            </div>
+            @if(commit.isDifferentFromAuthor) {
+            <div class="committer">
+              <span class="icon-arrow-right"></span>
+              <span>@user(commit.committerName, commit.committerEmailAddress, "username strong")</span>
+              <span class="muted"> committed on @datetime(commit.commitTime)</span>
+            </div>
+            }
+          </div>
         </td>
       </tr>
     </table>

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

@@ -36,7 +36,7 @@
     @commits.map { day =>
       <table class="table table-bordered">
         <tr>
-          <th>@date(day.head.time)</th>
+          <th>@date(day.head.commitTime)</th>
         </tr>
         @day.map { commit =>
         <tr>
@@ -57,8 +57,13 @@
                   <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
                 }
                 <div class="small">
-                  @user(commit.committer, commit.mailAddress, "username")
+                  @user(commit.authorName, commit.authorEmailAddress, "username")
-                  <span class="muted">@datetime(commit.time)</span>
+                  <span class="muted">authored @datetime(commit.authorTime)</span>
+                  @if(commit.isDifferentFromAuthor) {
+                    <span class="icon-arrow-right" style="margin-top : -2px ;"></span>
+                    @user(commit.committerName, commit.committerEmailAddress, "username")
+                    <span class="muted">committed @datetime(commit.authorTime)</span>
+                  }
                 </div>
               </div>
             </div>

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

@@ -60,6 +60,7 @@
             }
             <input type="submit" id="commit" class="btn btn-success" value="Commit changes" disabled="true"/>
             <input type="hidden" id="charset" name="charset" value="@content.charset"/>
+            <input type="hidden" id="lineSeparator" name="lineSeparator" value="@content.lineSeparator"/>
             <input type="hidden" id="content" name="content" value=""/>
             <input type="hidden" id="initial" value="@content.content"/>
           </div>

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

@@ -40,12 +40,23 @@
       <tr>
         <td colspan="4" class="latest-commit">
           <div>
-            @avatar(latestCommit, 20)
-            @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
-            <span class="muted">@datetime(latestCommit.time)</span>
             <div class="pull-right align-right monospace" style="line-height: 18px;">
               <a href="@url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
             </div>
+            <div class="author-info">
+              <div class="author">
+                @avatar(latestCommit, 20)
+                <span>@user(latestCommit.authorName, latestCommit.authorEmailAddress, "username strong")</span>
+                <span class="muted"> authored on @datetime(latestCommit.authorTime)</span>
+              </div>
+              @if(latestCommit.isDifferentFromAuthor) {
+              <div class="committer">
+                <span class="icon-arrow-right"></span>
+                <span>@user(latestCommit.committerName, latestCommit.committerEmailAddress, "username strong")</span>
+                <span class="muted"> committed on @datetime(latestCommit.commitTime)</span>
+              </div>
+              }
+            </div>
           </div>
         </td>
       </tr>
@@ -83,7 +94,7 @@
         </td>
         <td class="mute">
           <a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a>
-          [@user(file.committer, file.mailAddress)]
+          [@user(file.author, file.mailAddress)]
         </td>
         <td style="text-align: right;">@datetime(file.time)</td>
       </tr>

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

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

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

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

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

@@ -52,7 +52,7 @@
         </div>
       }
     </div>
-    <div style="margin-right: 220px;">
+    <div style="width: 650px;" class="pull-left">
       <div class="markdown-body">
         @markdown(page.content, repository, true, false)
       </div>

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

@@ -392,12 +392,14 @@ div.signin-form {
 /* Account page */
 /****************************************************************************/
 .account-fullname {
-  font-size: 140%;
+  margin-top: 20px;
+  font-size: 180%;
   font-weight: bold;
 }
 
 .account-username {
-  font-size: 120%;
+  margin-top: 10px;
+  font-size: 140%;
   color: #888888;
   font-weight: bold;
 }
@@ -822,6 +824,15 @@ a.absent {
   color: #c00;
 }
 
+/****************************************************************************/
+/* Commit */
+/****************************************************************************/
+div.author-info div.committer {
+  display: block;
+  margin-left: 25px;
+  font-size: 12px;
+}
+
 /****************************************************************************/
 /* Diff */
 /****************************************************************************/
@@ -879,7 +890,6 @@ div.markdown-body h1 {
 div.markdown-body h2 {
   border-bottom: 1px solid #eee;
   font-size: 2em;
-  margin-top: 30px;
 }
 
 div.markdown-body h3 {

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

@@ -12,12 +12,14 @@ $(function(){
 
 function validate(e){
   var form = $(e.target);
+  $(form).find('[type=submit]').attr('disabled', 'disabled')
   
   if(form.data('validated') == true){
     return true;
   }
 
   $.post(form.attr('action') + '/validate', $(e.target).serialize(), function(data){
+    $(form).find('[type=submit]').removeAttr('disabled')
     // clear all error messages
     $('.error').text('');
     

src/test/scala/service/AccountServiceSpec.scala

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

src/test/scala/service/ServiceSpecBase.scala

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