Sync upstream/maste to master and Merge branch 'master' into add-features-to-ldapauth

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/twirl/admin/system.scala.html

src/main/scala/util/ControlUtil.scala

@@ -3,7 +3,7 @@ package util
 import org.eclipse.jgit.api.Git
 import org.eclipse.jgit.revwalk.RevWalk
 import org.eclipse.jgit.treewalk.TreeWalk
-import org.eclipse.jgit.transport.RefSpec
+import scala.util.control.Exception._
 import scala.language.reflectiveCalls
 
 /**
@@ -16,10 +16,8 @@ object ControlUtil {
   def using[A <% { def close(): Unit }, B](resource: A)(f: A => B): B =
     try f(resource) finally {
       if(resource != null){
-        try {
+        ignoring(classOf[Throwable]) {
           resource.close()
-        } catch {
-          case e: Throwable => // ignore
         }
       }
     }

src/main/scala/util/Implicits.scala

@@ -1,6 +1,7 @@
 package util
 
 import scala.util.matching.Regex
+import scala.util.control.Exception._
 import javax.servlet.http.{HttpSession, HttpServletRequest}
 
 /**
@@ -42,10 +43,8 @@ object Implicits {
       sb.toString
     }
 
-    def toIntOpt: Option[Int] = try {
-      Option(Integer.parseInt(value))
-    } catch {
-      case e: NumberFormatException => None
+    def toIntOpt: Option[Int] = catching(classOf[NumberFormatException]) opt {
+      Integer.parseInt(value)
     }
   }
 

src/main/scala/util/JGitUtil.scala

@@ -128,7 +128,7 @@ object JGitUtil {
     using(Git.open(getRepositoryDir(owner, repository))){ git =>
       try {
         // get commit count
-        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(1000).sum
+        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum
 
         RepositoryInfo(
           owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",

src/main/scala/util/Keys.scala

@@ -13,12 +13,7 @@ object Keys {
     /**
      * Session key for the logged in account information.
      */
-    val LoginAccount = "LOGIN_ACCOUNT"
-
-    /**
-     * Session key for the redirect URL.
-     */
-    val Redirect = "REDIRECT"
+    val LoginAccount = "loginAccount"
 
     /**
      * Session key for the issue search condition in dashboard.
@@ -47,6 +42,20 @@ object Keys {
 
   }
 
+  object Flash {
+
+    /**
+     * Flash key for the redirect URL.
+     */
+    val Redirect = "redirect"
+
+    /**
+     * Flash key for the information message.
+     */
+    val Info = "info"
+
+  }
+
   /**
    * Define request keys.
    */

src/main/scala/util/StringUtil.scala

@@ -31,7 +31,7 @@ object StringUtil {
 
   /**
    * Make string from byte array. Character encoding is detected automatically by [[util.StringUtil.detectEncoding]].
-   * And if given bytes contains UTF-8 BOM, it's removed from returned string..
+   * And if given bytes contains UTF-8 BOM, it's removed from returned string.
    */
   def convertFromByteArray(content: Array[Byte]): String =
     IOUtils.toString(new BOMInputStream(new java.io.ByteArrayInputStream(content)), detectEncoding(content))
@@ -45,4 +45,23 @@ object StringUtil {
         case e    => e
       }
     }
+
+  /**
+   * Extract issue id like ```#issueId``` from the given message.
+   *
+   *@param message the message which may contains issue id
+   * @return the iterator of issue id
+   */
+  def extractIssueId(message: String): Iterator[String] =
+    "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(message).matchData.map(_.group(2))
+
+  /**
+   * Extract close issue id like ```close #issueId ``` from the given message.
+   *
+   * @param message the message which may contains close command
+   * @return the iterator of issue id
+   */
+  def extractCloseId(message: String): Iterator[String] =
+    "(?i)(?<!\\w)(?:fix(?:e[sd])?|resolve[sd]?|close[sd]?)\\s+#(\\d+)(?!\\w)".r.findAllIn(message).matchData.map(_.group(1))
+
 }