Merge branch 'master' into fork-and-pullreq

Conflicts: src/main/scala/app/RepositoryViewerController.scala src/main/scala/service/RepositoryService.scala
2025-11-15 09:55:49 +01:00 · 2013-08-04 05:10:01 +09:00
parent 7a8958741d 42faf9bda2
commit e52aa7ad3c
20 changed files with 792 additions and 256 deletions
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -58,7 +58,7 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
        case _ =>
          _root_.account.html.repositories(account,
            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getVisibleRepositories(userName, baseUrl, context.loginAccount.map(_.userName)))
+            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)))
      }
    } getOrElse NotFound
  }
--- a/src/main/scala/app/DashboardController.scala
+++ b/src/main/scala/app/DashboardController.scala
@@ -32,18 +32,26 @@ trait DashboardControllerBase extends ControllerBase {
    else IssueSearchCondition(request)

    session.put(sessionKey, condition)
-
-    val repositories = getAccessibleRepositories(context.loginAccount, baseUrl)
+
+    val userName = context.loginAccount.get.userName
+    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
+    val filterUser = Map(filter -> userName)
+    val page = IssueSearchCondition.page(request)
    // 
    dashboard.html.issues(
-        issues.html.listparts(Nil, 0, 0, 0, condition),
-        0,
-        0,
-        0,
-        repositories,
+        issues.html.listparts(
+            searchIssue(condition, filterUser, (page - 1) * IssueLimit, IssueLimit, repositories: _*),
+            page,
+            countIssue(condition.copy(state = "open"), filterUser, repositories: _*),
+            countIssue(condition.copy(state = "closed"), filterUser, repositories: _*),
+            condition),
+        countIssue(condition, Map.empty, repositories: _*),
+        countIssue(condition, Map("assigned" -> userName), repositories: _*),
+        countIssue(condition, Map("created_by" -> userName), repositories: _*),
+        countIssueGroupByRepository(condition, filterUser, repositories: _*),
        condition,
        filter)    
    
  }

-}
+}
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -16,19 +16,22 @@ trait IndexControllerBase extends ControllerBase {
    val loginAccount = context.loginAccount

    html.index(getRecentActivities(),
-      getAccessibleRepositories(loginAccount, baseUrl),
+      getVisibleRepositories(loginAccount, baseUrl),
      loadSystemSettings(),
-      loginAccount.map{ account => getRepositoryNamesOfUser(account.userName) }.getOrElse(Nil)
+      loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
    )
  }

  /**
   * JSON API for collaborator completion.
+   *
+   * TODO Move to other controller?
   */
-  // TODO Move to other controller?
  get("/_user/proposals")(usersOnly {
    contentType = formats("json")
-    org.json4s.jackson.Serialization.write(Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray))
+    org.json4s.jackson.Serialization.write(
+      Map("options" -> getAllUsers.filter(!_.isGroupAccount).map(_.userName).toArray)
+    )
  })


--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -301,16 +301,10 @@ trait IssuesControllerBase extends ControllerBase {
  private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {
    val owner      = repository.owner
    val repoName   = repository.name
-    val userName   = if(filter != "all") Some(params("userName")) else None
+    val filterUser = Map(filter -> params.getOrElse("userName", ""))
+    val page = IssueSearchCondition.page(request)
    val sessionKey = s"${owner}/${repoName}/issues"

-    val page = try {
-      val i = params.getOrElse("page", "1").toInt
-      if(i <= 0) 1 else i
-    } catch {
-      case e: NumberFormatException => 1
-    }
-
    // retrieve search condition
    val condition = if(request.getQueryString == null){
      session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
@@ -319,17 +313,17 @@ trait IssuesControllerBase extends ControllerBase {
    session.put(sessionKey, condition)

    issues.html.list(
-        searchIssue(owner, repoName, condition, filter, userName, (page - 1) * IssueLimit, IssueLimit),
+        searchIssue(condition, filterUser, (page - 1) * IssueLimit, IssueLimit, owner -> repoName),
        page,
        (getCollaborators(owner, repoName) :+ owner).sorted,
        getMilestones(owner, repoName),
        getLabels(owner, repoName),
-        countIssue(owner, repoName, condition.copy(state = "open"), filter, userName),
-        countIssue(owner, repoName, condition.copy(state = "closed"), filter, userName),
-        countIssue(owner, repoName, condition, "all", None),
-        context.loginAccount.map(x => countIssue(owner, repoName, condition, "assigned", Some(x.userName))),
-        context.loginAccount.map(x => countIssue(owner, repoName, condition, "created_by", Some(x.userName))),
-        countIssueGroupByLabels(owner, repoName, condition, filter, userName),
+        countIssue(condition.copy(state = "open"), filterUser, owner -> repoName),
+        countIssue(condition.copy(state = "closed"), filterUser, owner -> repoName),
+        countIssue(condition, Map.empty, owner -> repoName),
+        context.loginAccount.map(x => countIssue(condition, Map("assigned" -> x.userName), owner -> repoName)),
+        context.loginAccount.map(x => countIssue(condition, Map("created_by" -> x.userName), owner -> repoName)),
+        countIssueGroupByLabels(owner, repoName, condition, filterUser),
        condition,
        filter,
        repository,
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -37,49 +37,29 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    fileList(_)
  })
  
-  /**
-   * Displays the file list of the repository root and the specified branch.
-   */
-  get("/:owner/:repository/tree/:id")(referrersOnly {
-    fileList(_, params("id"))
-  })
-  
  /**
   * Displays the file list of the specified path and branch.
   */
-  get("/:owner/:repository/tree/:id/*")(referrersOnly {
-    fileList(_, params("id"), multiParams("splat").head)
-  })
-  
-  /**
-   * Displays the commit list of the specified branch.
-   */
-  get("/:owner/:repository/commits/:branch")(referrersOnly { repository =>
-    val branchName = params("branch")
-    val page       = params.getOrElse("page", "1").toInt
-    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
-      JGitUtil.getCommitLog(git, branchName, page, 30) match {
-        case Right((logs, hasNext)) =>
-          repo.html.commits(Nil, branchName, repository, logs.splitWith{ (commit1, commit2) =>
-            view.helpers.date(commit1.time) == view.helpers.date(commit2.time)
-          }, page, hasNext)
-        case Left(_) => NotFound
-      }
+  get("/:owner/:repository/tree/*")(referrersOnly { repository =>
+    val (id, path) = splitPath(repository, multiParams("splat").head)
+    if(path.isEmpty){
+      fileList(repository, id)
+    } else {
+      fileList(repository, id, path)
    }
  })
  
  /**
   * Displays the commit list of the specified resource.
   */
-  get("/:owner/:repository/commits/:branch/*")(referrersOnly { repository =>
-    val branchName = params("branch")
-    val path       = multiParams("splat").head //.replaceFirst("^tree/.+?/", "")
-    val page       = params.getOrElse("page", "1").toInt
+  get("/:owner/:repository/commits/*")(referrersOnly { repository =>
+    val (branchName, path) = splitPath(repository, multiParams("splat").head)
+    val page = params.getOrElse("page", "1").toInt

    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
      JGitUtil.getCommitLog(git, branchName, page, 30, path) match {
        case Right((logs, hasNext)) =>
-          repo.html.commits(path.split("/").toList, branchName, repository,
+          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)
            }, page, hasNext)
@@ -91,10 +71,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  /**
   * Displays the file content of the specified branch or commit.
   */
-  get("/:owner/:repository/blob/:id/*")(referrersOnly { repository =>
-    val id         = params("id") // branch name or commit id
-    val raw        = params.get("raw").getOrElse("false").toBoolean
-    val path       = multiParams("splat").head //.replaceFirst("^tree/.+?/", "")
+  get("/:owner/:repository/blob/*")(referrersOnly { repository =>
+    val (id, path) = splitPath(repository, multiParams("splat").head)
+    val raw = params.get("raw").getOrElse("false").toBoolean

    JGitUtil.withGit(getRepositoryDir(repository.owner, repository.name)){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
@@ -211,6 +190,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      repository)
  })
  
+  private def splitPath(repository: service.RepositoryService.RepositoryInfo, path: String): (String, String) = {
+    val id = repository.branchList.collectFirst {
+      case branch if(path == branch || path.startsWith(branch + "/")) => branch
+    } orElse repository.tags.collectFirst {
+      case tag if(path == tag.name || path.startsWith(tag.name + "/")) => tag.name
+    } orElse Some(path) get
+
+    (id, path.substring(id.length).replaceFirst("^/", ""))
+  }
+
  /**
   * Provides HTML of the file list.
   * 
--- a/src/main/scala/app/SearchController.scala
+++ b/src/main/scala/app/SearchController.scala
@@ -22,7 +22,7 @@ trait SearchControllerBase extends ControllerBase { self: RepositoryService
  case class SearchForm(query: String, owner: String, repository: String)

  post("/search", searchForm){ form =>
-    redirect(s"${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}")
+    redirect(s"/${form.owner}/${form.repository}/search?q=${StringUtil.urlEncode(form.query)}")
  }

  get("/:owner/:repository/search")(referrersOnly { repository =>
--- a/src/main/scala/service/IssuesService.scala
+++ b/src/main/scala/service/IssuesService.scala
@@ -42,18 +42,16 @@ trait IssuesService {
  /**
   * Returns the count of the search result against  issues.
   *
-   * @param owner the repository owner
-   * @param repository the repository name
   * @param condition the search condition
-   * @param filter the filter type ("all", "assigned" or "created_by")
-   * @param userName the filter user name required for "assigned" and "created_by"
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param repos Tuple of the repository owner and the repository name
   * @return the count of the search result
   */
-  def countIssue(owner: String, repository: String, condition: IssueSearchCondition, filter: String, userName: Option[String]): Int = {
+  def countIssue(condition: IssueSearchCondition, filterUser: Map[String, String], repos: (String, String)*): Int = {
    // TODO It must be _.length instead of map (_.issueId) list).length.
    //       But it does not work on Slick 1.0.1 (worked on Slick 1.0.0).
    //       https://github.com/slick/slick/issues/170
-    (searchIssueQuery(owner, repository, condition, filter, userName) map (_.issueId) list).length
+    (searchIssueQuery(repos, condition, filterUser) map (_.issueId) list).length
  }
  /**
   * Returns the Map which contains issue count for each labels.
@@ -61,14 +59,13 @@ trait IssuesService {
   * @param owner the repository owner
   * @param repository the repository name
   * @param condition the search condition
-   * @param filter the filter type ("all", "assigned" or "created_by")
-   * @param userName the filter user name required for "assigned" and "created_by"
-   * @return the Map which contains issue count for each labels (key is label name, value is issue count),
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @return the Map which contains issue count for each labels (key is label name, value is issue count)
   */
  def countIssueGroupByLabels(owner: String, repository: String, condition: IssueSearchCondition,
-                              filter: String, userName: Option[String]): Map[String, Int] = {
+                              filterUser: Map[String, String]): Map[String, Int] = {

-    searchIssueQuery(owner, repository, condition.copy(labels = Set.empty), filter, userName)
+    searchIssueQuery(Seq(owner -> repository), condition.copy(labels = Set.empty), filterUser)
      .innerJoin(IssueLabels).on { (t1, t2) =>
        t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
      }
@@ -83,24 +80,43 @@ trait IssuesService {
      }
      .toMap
  }
+  /**
+   * Returns list which contains issue count for each repository.
+   * If the issue does not exist, its repository is not included in the result.
+   *
+   * @param condition the search condition
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
+   * @param repos Tuple of the repository owner and the repository name
+   * @return list which contains issue count for each repository
+   */
+  def countIssueGroupByRepository(condition: IssueSearchCondition, filterUser: Map[String, String],
+                              repos: (String, String)*): List[(String, String, Int)] = {
+    searchIssueQuery(repos, condition.copy(repo = None), filterUser)
+      .groupBy { t =>
+        t.userName ~ t.repositoryName
+      }
+      .map { case (repo, t) =>
+        repo ~ t.length
+      }
+      .filter (_._3 > 0.bind)
+      .list
+  }

  /**
   * Returns the search result against  issues.
   *
-   * @param owner the repository owner
-   * @param repository the repository name
   * @param condition the search condition
-   * @param filter the filter type ("all", "assigned" or "created_by")
-   * @param userName the filter user name required for "assigned" and "created_by"
+   * @param filterUser the filter user name (key is "all", "assigned" or "created_by", value is the user name)
   * @param offset the offset for pagination
   * @param limit the limit for pagination
+   * @param repos Tuple of the repository owner and the repository name
   * @return the search result (list of tuples which contain issue, labels and comment count)
   */
-  def searchIssue(owner: String, repository: String, condition: IssueSearchCondition,
-                  filter: String, userName: Option[String], offset: Int, limit: Int): List[(Issue, List[Label], Int)] = {
+  def searchIssue(condition: IssueSearchCondition, filterUser: Map[String, String],
+                  offset: Int, limit: Int, repos: (String, String)*): List[(Issue, List[Label], Int)] = {

    // get issues and comment count and labels
-    searchIssueQuery(owner, repository, condition, filter, userName)
+    searchIssueQuery(repos, condition, filterUser)
        .innerJoin(IssueOutline).on { (t1, t2) => t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) }
        .leftJoin (IssueLabels) .on { case ((t1, t2), t3) => t1.byIssue(t3.userName, t3.repositoryName, t3.issueId) }
        .leftJoin (Labels)      .on { case (((t1, t2), t3), t4) => t3.byLabel(t4.userName, t4.repositoryName, t4.labelId) }
@@ -122,7 +138,11 @@ trait IssuesService {
        }
        .drop(offset).take(limit)
        .list
-        .splitWith(_._1.issueId == _._1.issueId)
+        .splitWith { (c1, c2) =>
+          c1._1.userName == c2._1.userName &&
+          c1._1.repositoryName == c2._1.repositoryName &&
+          c1._1.issueId == c2._1.issueId
+        }
        .map { issues => issues.head match {
          case (issue, commentCount, _,_,_) =>
            (issue,
@@ -136,14 +156,18 @@ trait IssuesService {
  /**
   * Assembles query for conditional issue searching.
   */
-  private def searchIssueQuery(owner: String, repository: String, condition: IssueSearchCondition, filter: String, userName: Option[String]) =
+  private def searchIssueQuery(repos: Seq[(String, String)], condition: IssueSearchCondition, filterUser: Map[String, String]) =
    Query(Issues) filter { t1 =>
-      (t1.byRepository(owner, repository)) &&
+      condition.repo
+          .map { _.split('/') match { case array => Seq(array(0) -> array(1)) } }
+          .getOrElse (repos)
+          .map { case (owner, repository) => t1.byRepository(owner, repository) }
+          .foldLeft[Column[Boolean]](false) ( _ || _ ) &&
      (t1.closed           is (condition.state == "closed").bind) &&
      (t1.milestoneId      is condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) &&
      (t1.milestoneId      isNull, condition.milestoneId == Some(None)) &&
-      (t1.assignedUserName is userName.get.bind, filter == "assigned") &&
-      (t1.openedUserName   is userName.get.bind, filter == "created_by") &&
+      (t1.assignedUserName is filterUser("assigned").bind, filterUser.get("assigned").isDefined) &&
+      (t1.openedUserName   is filterUser("created_by").bind, filterUser.get("created_by").isDefined) &&
      (IssueLabels filter { t2 =>
        (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) &&
        (t2.labelId in
@@ -329,6 +353,13 @@ object IssuesService {
        param(request, "state",     Seq("open", "closed")).getOrElse("open"),
        param(request, "sort",      Seq("created", "comments", "updated")).getOrElse("created"),
        param(request, "direction", Seq("asc", "desc")).getOrElse("desc"))
+
+    def page(request: HttpServletRequest) = try {
+      val i = param(request, "page").getOrElse("1").toInt
+      if(i <= 0) 1 else i
+    } catch {
+      case e: NumberFormatException => 1
+    }
  }

 }
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -61,45 +61,6 @@ trait RepositoryService { self: AccountService =>
  def getRepositoryNamesOfUser(userName: String): List[String] =
    Query(Repositories) filter(_.userName is userName.bind) map (_.repositoryName) list

-  /**
-   * Returns the list of specified user's repositories information.
-   *
-   * @param userName the user name
-   * @param baseUrl the base url of this application
-   * @param loginUserName the logged in user name
-   * @return the list of repository information which is sorted in descending order of lastActivityDate.
-   */
-  def getVisibleRepositories(userName: String, baseUrl: String, loginUserName: Option[String]): List[RepositoryInfo] = {
-    val q1 = Repositories
-      .filter { t => t.userName is userName.bind }
-      .map    { r => r }
-
-    val q2 = Collaborators
-      .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
-      .filter{ case (t1, t2) => t1.collaboratorName is userName.bind}
-      .map   { case (t1, t2) => t2 }
-
-    def visibleFor(t: Repositories.type, loginUserName: Option[String]) = {
-      loginUserName match {
-        case Some(x) => (t.isPrivate is false.bind) || (
-          (t.isPrivate is true.bind) && ((t.userName is x.bind) || (Collaborators.filter { c =>
-            c.byRepository(t.userName, t.repositoryName) && (c.collaboratorName is x.bind)
-          }.exists)))
-        case None    => (t.isPrivate is false.bind)
-      }
-    }
-
-    q1.union(q2).filter(visibleFor(_, loginUserName)).sortBy(_.lastActivityDate desc).list map { repository =>
-      new RepositoryInfo(
-        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
-        repository,
-        getForkedCount(
-          repository.originUserName.getOrElse(repository.userName),
-          repository.originRepositoryName.getOrElse(repository.repositoryName)
-        ))
-    }
-  }
-
  /**
   * Returns the specified repository information.
   * 
@@ -120,16 +81,11 @@ trait RepositoryService { self: AccountService =>
    }
  }

-  /**
-   * Returns the list of accessible repositories information for the specified account user.
-   * 
-   * @param account the account
-   * @param baseUrl the base url of this application
-   * @return the repository informations which is sorted in descending order of lastActivityDate.
-   */
-  def getAccessibleRepositories(account: Option[Account], baseUrl: String): List[RepositoryInfo] = {
-
-    def newRepositoryInfo(repository: Repository): RepositoryInfo = {
+  def getUserRepositories(userName: String, baseUrl: String): List[RepositoryInfo] = {
+    Query(Repositories).filter { t1 =>
+      (t1.userName is userName.bind) ||
+        (Query(Collaborators).filter { t2 => t2.byRepository(t1.userName, t1.repositoryName) && (t2.collaboratorName is userName.bind)} exists)
+    }.sortBy(_.lastActivityDate desc).list.map{ repository =>
      new RepositoryInfo(
        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
        repository,
@@ -138,18 +94,39 @@ trait RepositoryService { self: AccountService =>
          repository.originRepositoryName.getOrElse(repository.repositoryName)
        ))
    }
+  }

-    (account match {
+  /**
+   * Returns the list of visible repositories for the specified user.
+   * If repositoryUserName is given then filters results by repository owner.
+   *
+   * @param loginAccount the logged in account
+   * @param baseUrl the base url of this application
+   * @param repositoryUserName the repository owner (if None then returns all repositories which are visible for logged in user)
+   * @return the repository information which is sorted in descending order of lastActivityDate.
+   */
+  def getVisibleRepositories(loginAccount: Option[Account], baseUrl: String, repositoryUserName: Option[String] = None): List[RepositoryInfo] = {
+    (loginAccount match {
      // for Administrators
      case Some(x) if(x.isAdmin) => Query(Repositories)
      // for Normal Users
      case Some(x) if(!x.isAdmin) =>
        Query(Repositories) filter { t => (t.isPrivate is false.bind) ||
-          (Query(Collaborators).filter(t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)) exists)
+          (Query(Collaborators).filter { t2 => t2.byRepository(t.userName, t.repositoryName) && (t2.collaboratorName is x.userName.bind)} exists)
        }
      // for Guests
      case None => Query(Repositories) filter(_.isPrivate is false.bind)
-    }).sortBy(_.lastActivityDate desc).list.map(newRepositoryInfo _)
+    }).filter { t =>
+      repositoryUserName.map { userName => t.userName is userName.bind } getOrElse ConstColumn.TRUE
+    }.sortBy(_.lastActivityDate desc).list.map{ repository =>
+      new RepositoryInfo(
+        JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl),
+        repository,
+        getForkedCount(
+          repository.originUserName.getOrElse(repository.userName),
+          repository.originRepositoryName.getOrElse(repository.repositoryName)
+        ))
+    }
  }

  /**
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -133,15 +133,18 @@ object JGitUtil {
  }
  
  /**
-   * Returns RevCommit from the commit id.
+   * Returns RevCommit from the commit or tag id.
   * 
   * @param git the Git object
-   * @param commitId the ObjectId of the commit
-   * @return the RevCommit for the specified commit
+   * @param objectId the ObjectId of the commit or tag
+   * @return the RevCommit for the specified commit or tag
   */
-  def getRevCommitFromId(git: Git, commitId: ObjectId): RevCommit = {
+  def getRevCommitFromId(git: Git, objectId: ObjectId): RevCommit = {
    val revWalk = new RevWalk(git.getRepository)
-    val revCommit = revWalk.parseCommit(commitId)
+    val revCommit = revWalk.parseAny(objectId) match {
+      case r: RevTag => revWalk.parseCommit(r.getObject)
+      case _ => revWalk.parseCommit(objectId)
+    }
    revWalk.dispose
    revCommit
  }
@@ -349,51 +352,11 @@ object JGitUtil {
   * @return the list of latest commit
   */
  def getLatestCommitFromPaths(git: Git, paths: List[String], revision: String): Map[String, RevCommit] = {
-
-    val map = new scala.collection.mutable.HashMap[String, RevCommit]
-
-    val revWalk = new RevWalk(git.getRepository)
-    revWalk.markStart(revWalk.parseCommit(git.getRepository.resolve(revision)))
-    //revWalk.sort(RevSort.REVERSE);
-    val i = revWalk.iterator
-
-    while(i.hasNext && map.size != paths.length){
-      val commit = i.next
-      if(commit.getParentCount == 0){
-        // Initial commit
-        val treeWalk = new TreeWalk(git.getRepository)
-        treeWalk.reset()
-        treeWalk.setRecursive(true)
-        treeWalk.addTree(commit.getTree)
-        while (treeWalk.next) {
-          paths.foreach { path =>
-            if(treeWalk.getPathString.startsWith(path) && !map.contains(path)){
-              map.put(path, commit)
-            }
-          }
-        }
-        treeWalk.release
-      } else {
-        (0 to commit.getParentCount - 1).foreach { i =>
-          val parent = revWalk.parseCommit(commit.getParent(i).getId())
-          val df = new DiffFormatter(DisabledOutputStream.INSTANCE)
-          df.setRepository(git.getRepository)
-          df.setDiffComparator(RawTextComparator.DEFAULT)
-          df.setDetectRenames(true)
-          val diffs = df.scan(parent.getTree(), commit.getTree)
-          diffs.asScala.foreach { diff =>
-            paths.foreach { path =>
-              if(diff.getChangeType != ChangeType.DELETE && diff.getNewPath.startsWith(path) && !map.contains(path)){
-                map.put(path, commit)
-              }
-            }
-          }
-        }
-      }
-
-      revWalk.release
-    }
-    map.toMap
+    val start = getRevCommitFromId(git, git.getRepository.resolve(revision))
+    paths.map { path =>
+      val commit = git.log.add(start).addPath(path).setMaxCount(1).call.iterator.next
+      (path, commit)
+    }.toMap
  }

  /**
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -12,8 +12,13 @@ trait AvatarImageProvider { self: RequestCache =>
   */
  protected def getAvatarImageHtml(userName: String, size: Int,
      mailAddress: String = "", tooltip: Boolean = false)(implicit context: app.Context): Html = {
-    val src = getAccountByUserName(userName).collect { case account if(account.image.isEmpty) =>
-      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+
+    val src = getAccountByUserName(userName).map { account =>
+      if(account.image.isEmpty){
+        s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
+      } else {
+        s"""${context.path}/${userName}/_avatar"""
+      }
    } getOrElse {
      if(mailAddress.nonEmpty){
        s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
--- a/src/main/twirl/dashboard/issues.scala.html
+++ b/src/main/twirl/dashboard/issues.scala.html
@@ -2,7 +2,7 @@
  allCount: Int,
  assignedCount: Int,
  createdByCount: Int,
-  repositories: List[service.RepositoryService.RepositoryInfo],
+  repositories: List[(String, String, Int)],
  condition: service.IssuesService.IssueSearchCondition,
  filter: String)(implicit context: app.Context)
@import context._
@@ -13,19 +13,19 @@
  <div class="span3">
    <ul class="nav nav-pills nav-stacked">
      <li@if(filter == "all"){ class="active"}>
-        <a href="/dashboard/issues/repos@condition.toURL">
+        <a href="@path/dashboard/issues/repos@condition.toURL">
          <span class="count-right">@allCount</span>
          In your repositories
        </a>
      </li>
      <li@if(filter == "assigned"){ class="active"}>
-        <a href="/dashboard/issues/assigned@condition.toURL">
+        <a href="@path/dashboard/issues/assigned@condition.toURL">
          <span class="count-right">@assignedCount</span>
          Assigned to you
        </a>
      </li>
      <li@if(filter == "created_by"){ class="active"}>
-        <a href="/dashboard/issues/created_by@condition.toURL">
+        <a href="@path/dashboard/issues/created_by@condition.toURL">
          <span class="count-right">@createdByCount</span>
          Created by you
        </a>
@@ -33,11 +33,11 @@
    </ul>
    <hr/>
    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { repository =>
-      <li>
-        <a href="@condition.copy(repo = Some(repository.owner + "/" + repository.name)).toURL">
-          <span class="count-right">0</span>
-          @repository.owner/@repository.name
+      @repositories.map { case (owner, name, count) =>
+      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+        <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
+          <span class="count-right">@count</span>
+          @owner/@name
        </a>
      </li>
      }
--- a/src/main/twirl/dashboard/tab.scala.html
+++ b/src/main/twirl/dashboard/tab.scala.html
@@ -1,8 +1,8 @@
@(active: String = "")(implicit context: app.Context)
@import context._
 <ul class="nav nav-tabs">
-  <li@if(active == ""){ class="active"}><a href="/">News Feed</a></li>
+  <li@if(active == ""){ class="active"}><a href="@path/">News Feed</a></li>
  @if(loginAccount.isDefined){
-    <li@if(active == "issues"){ class="active"}><a href="/dashboard/issues/repos">Issues</a></li>
+    <li@if(active == "issues"){ class="active"}><a href="@path/dashboard/issues/repos">Issues</a></li>
  }
 </ul>
--- a/src/main/twirl/index.scala.html
+++ b/src/main/twirl/index.scala.html
@@ -1,7 +1,7 @@
@(activities: List[model.Activity],
-  repositories: List[service.RepositoryService.RepositoryInfo], 
+  recentRepositories: List[service.RepositoryService.RepositoryInfo],
  systemSettings: service.SystemSettingsService.SystemSettings,
-  userRepositories: List[String])(implicit context: app.Context)
+  userRepositories: List[service.RepositoryService.RepositoryInfo])(implicit context: app.Context)
@import context._
@import view.helpers._
@main("GitBucket"){
@@ -28,9 +28,15 @@
            <td>No repositories</td>
          </tr>
        } else {
-          @userRepositories.map { repositoryName =>
+          @userRepositories.map { repository =>
            <tr>
-              <td><a href="@path/@loginAccount.get.userName/@repositoryName"><strong>@repositoryName</strong></a></td>
+              <td>
+                @if(repository.owner == loginAccount.get.userName){
+                  <a href="@url(repository)"><strong>@repository.name</strong></a>
+                } else {
+                  <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
+                }
+              </td>
            </tr>
          }
        }
@@ -43,12 +49,12 @@
          Recent updated repositories
        </th>
      </tr>
-      @if(repositories.isEmpty){
+      @if(recentRepositories.isEmpty){
        <tr>
          <td>No repositories</td>
        </tr>
      } else {
-        @repositories.map { repository =>
+        @recentRepositories.map { repository =>
          <tr>
            <td>
              <a href="@url(repository)">@repository.owner/<strong>@repository.name</strong></a>
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -146,7 +146,7 @@
              <input type="checkbox" value="@issue.issueId"/>
            }
              @if(repository.isEmpty){
-              <a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a>&nbsp;&#xFF65;&nbsp;
+              <a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a>&nbsp;&#xFF65;
              }
              <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-title">@issue.title</a>
              @labels.map { label =>
--- a/src/main/twirl/repo/tab.scala.html
+++ b/src/main/twirl/repo/tab.scala.html
@@ -26,9 +26,9 @@
    </div>
  </li>
  }
-  <li@if(active=="files"){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>
+  <li@if(active=="files"  ){ class="active"}><a href="@url(repository)/tree/@id">Files</a></li>
  <li@if(active=="commits"){ class="active"}><a href="@url(repository)/commits/@id">Commits</a></li>
-  <li@if(active=="tags"){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
+  <li@if(active=="tags"   ){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
  <li class="pull-right">
    <div class="input-append">
      <input type="text" value="@repository.url" id="repository-url" readonly>
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -13,8 +13,7 @@
            <label for="description"><strong>Description</strong></label>
            <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
          </fieldset>
-          <hr>
-          <fieldset>
+          <fieldset class="margin">
            <label for="defaultBranch"><strong>Default Branch</strong></label>
            <select name="defaultBranch" id="defaultBranch">
              @repository.branchList.map { branch =>
@@ -22,7 +21,6 @@
              }
            </select>
          </fieldset>
-          <hr>
          <fieldset class="margin">
            <label>
              <input type="radio" name="isPrivate" value="false"
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -81,22 +81,29 @@
  <servlet>
    <servlet-name>H2Console</servlet-name>
    <servlet-class>org.h2.server.web.WebServlet</servlet-class>
-    <!--
    <init-param>
        <param-name>webAllowOthers</param-name>
        <param-value></param-value>
    </init-param>
-    <init-param>
-        <param-name>trace</param-name>
-        <param-value></param-value>
-    </init-param>
-    -->
+      <!--
+      <init-param>
+          <param-name>trace</param-name>
+          <param-value></param-value>
+      </init-param>
+      -->
    <load-on-startup>1</load-on-startup>
  </servlet>
  
  <servlet-mapping>
    <servlet-name>H2Console</servlet-name>
    <url-pattern>/console/*</url-pattern>
-  </servlet-mapping>  
-  
+  </servlet-mapping>
+
+  <!-- ===================================================================== -->
+  <!-- Session timeout -->
+  <!-- ===================================================================== -->
+  <session-config>
+    <session-timeout>1440</session-timeout>
+  </session-config>
+
 </web-app>