Merge branch 'master' into fork-and-pullreq

Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/util/JGitUtil.scala

src/main/scala/service/ActivityService.scala

@@ -55,7 +55,7 @@ trait ActivityService {
   def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
       "reopen_issue",
-      s"[user:${activityUserName}] closed reopened [issue:${userName}/${repositoryName}#${issueId}]",
+      s"[user:${activityUserName}] reopened issue [issue:${userName}/${repositoryName}#${issueId}]",
       Some(title),
       currentDate)
 

src/main/scala/service/IssuesService.scala

@@ -6,6 +6,7 @@ import scala.slick.jdbc.{StaticQuery => Q}
 import Q.interpolation
 
 import model._
+import util.StringUtil._
 import util.Implicits._
 
 trait IssuesService {
@@ -35,6 +36,9 @@ trait IssuesService {
       .map    ( _._2 )
       .list
 
+  def getIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int) =
+    Query(IssueLabels) filter (_.byPrimaryKey(owner, repository, issueId, labelId)) firstOption
+
   /**
    * Returns the count of the search result against  issues.
    *
@@ -233,7 +237,6 @@ trait IssuesService {
 }
 
 object IssuesService {
-  import java.net.URLEncoder
   import javax.servlet.http.HttpServletRequest
 
   val IssueLimit = 30
@@ -245,8 +248,6 @@ object IssuesService {
       sort: String = "created",
       direction: String = "desc"){
 
-    import IssueSearchCondition._
-
     def toURL: String =
       "?" + List(
         if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))),
@@ -262,8 +263,6 @@ object IssuesService {
 
   object IssueSearchCondition {
 
-    private def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8")
-
     private def param(request: HttpServletRequest, name: String, allow: Seq[String] = Nil): Option[String] = {
       val value = request.getParameter(name)
       if(value == null || value.isEmpty || (allow.nonEmpty && !allow.contains(value))) None else Some(value)

src/main/scala/service/RequestCache.scala

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