Merge branch 'master' into #33_match-by-email

Conflicts:
	src/main/scala/util/JGitUtil.scala
	src/main/scala/view/helpers.scala
	src/main/twirl/repo/blob.scala.html
	src/main/twirl/repo/commit.scala.html
	src/main/twirl/repo/commits.scala.html
	src/main/twirl/repo/files.scala.html

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,7 +1,7 @@
 GitBucket
 =========
 
-GitBucket is a Github clone by Scala, Easy to setup.
+GitBucket is the easily installable Github clone written with Scala.
 
 The current version of GitBucket provides a basic features below:
 
@@ -9,12 +9,12 @@ The current version of GitBucket provides a basic features below:
 - Repository viewer (some advanced features are not implemented)
 - Wiki
 - Issues
+- Activity timeline
 - User management (for Administrators)
 
 Following features are not implemented, but we will make them in the future release!
 
 - Fork and pull request
-- Timeline
 - Search
 - Network graph
 - Statics
@@ -32,8 +32,20 @@ Installation
 
 The default administrator account is **root** and password is **root**.
 
+To upgrade GitBucket, only replace gitbucket.war.
+
 Release Notes
 --------
+### 1.3 - xx Jul 2013
+- Batch updating for issues.
+- Display assigned user on issue list.
+- User icon and Gravatar support.
+- Convert @xxxx to link to the account page.
+- Add copy to clipboard button for git clone URL.
+- Allows multi-byte characters as wiki page name.
+- Allows to create the empty repository.
+- Fixed some bugs.
+
 ### 1.2 - 09 Jul 2013
 - Added activity timeline.
 - Bugfix for Git 1.8.1.5 or later.

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

@@ -1 +1,8 @@
 ALTER TABLE ACCOUNT ADD COLUMN IMAGE VARCHAR(100);
+
+UPDATE ISSUE_COMMENT SET ACTION = 'comment' WHERE ACTION IS NULL;
+
+ALTER TABLE ISSUE_COMMENT ALTER COLUMN ACTION VARCHAR(20) NOT NULL;
+
+UPDATE ISSUE_COMMENT SET ACTION = 'close_comment'  WHERE ACTION = 'close';
+UPDATE ISSUE_COMMENT SET ACTION = 'reopen_comment' WHERE ACTION = 'reopen';

src/main/scala/app/AccountController.scala

@@ -58,7 +58,10 @@ trait AccountControllerBase extends AccountManagementControllerBase with FlashMa
     getAccountByUserName(userName).flatMap(_.image).map { image =>
       contentType = FileUtil.getMimeType(image)
       new java.io.File(getUserUploadDir(userName), image)
-    } getOrElse NotFound
+    } getOrElse {
+      contentType = "image/png"
+      Thread.currentThread.getContextClassLoader.getResourceAsStream("noimage.png")
+    }
   }
 
   get("/:userName/_edit")(oneselfOnly {

src/main/scala/app/IssuesController.scala

@@ -128,11 +128,15 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, Some(form.content), repository)
+    handleComment(form.issueId, Some(form.content), repository)() map { id =>
+      redirect("/%s/%s/issues/%d#comment-%d".format(repository.owner, repository.name, form.issueId, id))
+    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) =>
-    handleComment(form.issueId, form.content, repository)
+    handleComment(form.issueId, form.content, repository)() map { id =>
+      redirect("/%s/%s/issues/%d#comment-%d".format(repository.owner, repository.name, form.issueId, id))
+    } getOrElse NotFound
   })
 
   ajaxPost("/:owner/:repository/issue_comments/edit/:id", commentForm)(readableUsersOnly { (form, repository) =>
@@ -158,7 +162,7 @@ trait IssuesControllerBase extends ControllerBase {
           org.json4s.jackson.Serialization.write(
               Map("title"   -> x.title,
                   "content" -> view.Markdown.toHtml(x.content getOrElse "No description given.",
-                      repository, false, true, true)
+                      repository, false, true)
               ))
         }
       } else Unauthorized
@@ -175,7 +179,7 @@ trait IssuesControllerBase extends ControllerBase {
           contentType = formats("json")
           org.json4s.jackson.Serialization.write(
               Map("content" -> view.Markdown.toHtml(x.content,
-                  repository, false, true, true)
+                  repository, false, true)
               ))
         }
       } else Unauthorized
@@ -197,79 +201,76 @@ trait IssuesControllerBase extends ControllerBase {
   })
 
   ajaxPost("/:owner/:repository/issues/:id/assign")(collaboratorsOnly { repository =>
-    updateAssignedUserName(repository.owner, repository.name, params("id").toInt,
+    updateAssignedUserName(repository.owner, repository.name, params("id").toInt, assignedUserName("assignedUserName"))
-        params.get("assignedUserName") filter (_.trim != ""))
     Ok("updated")
   })
 
   ajaxPost("/:owner/:repository/issues/:id/milestone")(collaboratorsOnly { repository =>
-    updateMilestoneId(repository.owner, repository.name, params("id").toInt,
+    updateMilestoneId(repository.owner, repository.name, params("id").toInt, milestoneId("milestoneId"))
-        params.get("milestoneId") collect { case x if x.trim != "" => x.toInt })
     Ok("updated")
   })
 
   post("/:owner/:repository/issues/batchedit/state")(collaboratorsOnly { repository =>
-    val owner = repository.owner
+    val action = params.get("value")
-    val name = repository.name
-    val userName = context.loginAccount.get.userName
 
-    params.get("value") collect {
+    executeBatch(repository) {
-      case s if s == "close"  => (s.capitalize, Some(s), true)
+      handleComment(_, None, repository)( _ => action)
-      case s if s == "reopen" => (s.capitalize, Some(s), false)
+    }
-    } map { case (content, action, closed) =>
-      params("checked").split(',') foreach { issueId =>
-        createComment(owner, name, userName, issueId.toInt, content, action)
-        updateClosed(owner, name, issueId.toInt, closed)
-      }
-      redirect("/%s/%s/issues".format(owner, name))
-    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/batchedit/label")(collaboratorsOnly { repository =>
-    val owner = repository.owner
+    val labelId = params("value").toInt
-    val name = repository.name
 
-    params.get("value").map(_.toInt) map { labelId =>
+    executeBatch(repository) { issueId =>
-      params("checked").split(',') foreach { issueId =>
+      getIssueLabel(repository.owner, repository.name, issueId, labelId) getOrElse {
-        getIssueLabel(owner, name, issueId.toInt, labelId) getOrElse {
+        registerIssueLabel(repository.owner, repository.name, issueId, labelId)
-          registerIssueLabel(owner, name, issueId.toInt, labelId)
-        }
       }
-      redirect("/%s/%s/issues".format(owner, name))
+    }
-    } getOrElse NotFound
   })
 
   post("/:owner/:repository/issues/batchedit/assign")(collaboratorsOnly { repository =>
-    params("checked").split(',') foreach { issueId =>
+    val value = assignedUserName("value")
-      updateAssignedUserName(repository.owner, repository.name, issueId.toInt,
+
-          params.get("value") filter (_.trim != ""))
+    executeBatch(repository) {
+      updateAssignedUserName(repository.owner, repository.name, _, value)
     }
-    redirect("/%s/%s/issues".format(repository.owner, repository.name))
   })
 
   post("/:owner/:repository/issues/batchedit/milestone")(collaboratorsOnly { repository =>
-    params("checked").split(',') foreach { issueId =>
+    val value = milestoneId("value")
-      updateMilestoneId(repository.owner, repository.name, issueId.toInt,
+
-          params.get("value") collect { case x if x.trim != "" => x.toInt })
+    executeBatch(repository) {
+      updateMilestoneId(repository.owner, repository.name, _, value)
     }
-    redirect("/%s/%s/issues".format(repository.owner, repository.name))
   })
 
+  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
+  val milestoneId      = (key: String) => params.get(key) collect { case x if x.trim != "" => x.toInt }
+
   private def isEditable(owner: String, repository: String, author: String)(implicit context: app.Context): Boolean =
     hasWritePermission(owner, repository, context.loginAccount) || author == context.loginAccount.get.userName
 
-  private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo) = {
+  private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = {
+    params("checked").split(',') map(_.toInt) foreach execute
+    redirect("/%s/%s/issues".format(repository.owner, repository.name))
+  }
+
+  /**
+   * @see 
+   */
+  private def handleComment(issueId: Int, content: Option[String], repository: RepositoryService.RepositoryInfo)
+      (getAction: model.Issue => Option[String] =
+           p1 => params.get("action").filter(_ => isEditable(p1.userName, p1.repositoryName, p1.openedUserName))) = {
     val owner    = repository.owner
     val name     = repository.name
     val userName = context.loginAccount.get.userName
 
     getIssue(owner, name, issueId.toString) map { issue =>
       val (action, recordActivity) =
-        params.get("action")
+        getAction(issue)
-          .filter(_ => isEditable(owner, name, issue.openedUserName))
           .collect {
-            case s if s == "close"  => true  -> (Some(s) -> Some(recordCloseIssueActivity _))
+            case "close"  => true  -> (Some("close")  -> Some(recordCloseIssueActivity _))
-            case s if s == "reopen" => false -> (Some(s) -> Some(recordReopenIssueActivity _))
+            case "reopen" => false -> (Some("reopen") -> Some(recordReopenIssueActivity _))
           }
           .map { case (closed, t) =>
             updateClosed(owner, name, issueId, closed)
@@ -277,14 +278,19 @@ trait IssuesControllerBase extends ControllerBase {
           }
           .getOrElse(None -> None)
 
-      val commentId = createComment(owner, name, userName, issueId, content.getOrElse(action.get.capitalize), action)
+      val commentId = content
+          .map       ( _ -> action.map( _ + "_comment" ).getOrElse("comment") )
+          .getOrElse ( action.get.capitalize -> action.get )
+          match {
+            case (content, action) => createComment(owner, name, userName, issueId, content, action)
+          }
 
       // record activity
       content foreach ( recordCommentIssueActivity(owner, name, userName, issueId, _) )
       recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
 
-      redirect("/%s/%s/issues/%d#comment-%d".format(owner, name, issueId, commentId))
+      commentId
-    } getOrElse NotFound
+    }
   }
 
   private def searchIssues(filter: String, repository: RepositoryService.RepositoryInfo) = {

src/main/scala/app/RepositoryViewerController.scala

@@ -27,8 +27,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
     contentType = "text/html"
     view.helpers.markdown(params("content"), repository,
       params("enableWikiLink").toBoolean,
-      params("enableCommitLink").toBoolean,
+      params("enableRefsLink").toBoolean)
-      params("enableIssueLink").toBoolean)
   })
 
   /**

src/main/scala/model/IssueComment.scala

@@ -9,9 +9,9 @@ object IssueComments extends Table[IssueComment]("ISSUE_COMMENT") with IssueTemp
   def content = column[String]("CONTENT")
   def registeredDate = column[java.util.Date]("REGISTERED_DATE")
   def updatedDate = column[java.util.Date]("UPDATED_DATE")
-  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
+  def * = userName ~ repositoryName ~ issueId ~ commentId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate <> (IssueComment, IssueComment.unapply _)
 
-  def autoInc = userName ~ repositoryName ~ issueId ~ action.? ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
+  def autoInc = userName ~ repositoryName ~ issueId ~ action ~ commentedUserName ~ content ~ registeredDate ~ updatedDate returning commentId
   def byPrimaryKey(commentId: Int) = this.commentId is commentId.bind
 }
 
@@ -20,7 +20,7 @@ case class IssueComment(
     repositoryName: String,
     issueId: Int,
     commentId: Int,
-    action: Option[String],
+    action: String,
     commentedUserName: String,
     content: String,
     registeredDate: java.util.Date,

src/main/scala/service/IssuesService.scala

@@ -102,7 +102,10 @@ trait IssuesService {
     // get issues and comment count
     val issues = searchIssueQuery(owner, repository, condition, filter, userName)
       .leftJoin(Query(IssueComments)
-        .filter  { _.byRepository(owner, repository) }
+        .filter  { t =>
+          (t.byRepository(owner, repository)) &&
+          (t.action inSetBind Seq("comment", "close_comment", "reopen_comment"))
+        }
         .groupBy { _.issueId }
         .map     { case (issueId, t) => issueId ~ t.length }).on((t1, t2) => t1.issueId is t2._1)
       .sortBy { case (t1, t2) =>
@@ -192,7 +195,7 @@ trait IssuesService {
     IssueLabels filter(_.byPrimaryKey(owner, repository, issueId, labelId)) delete
 
   def createComment(owner: String, repository: String, loginUser: String,
-      issueId: Int, content: String, action: Option[String]) =
+      issueId: Int, content: String, action: String) =
     IssueComments.autoInc insert (
         owner,
         repository,

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)
+    }
+  }
+
+}
+

src/main/scala/servlet/GitRepositoryServlet.scala

@@ -85,7 +85,7 @@ class CommitLogHook(owner: String, repository: String, userName: String) extends
             "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData =>
               val issueId = matchData.group(2)
               if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){
-                createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, Some("commit"))
+                createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, "commit")
               }
             }
             Some(commit)

src/main/scala/util/Implicits.scala

@@ -1,7 +1,7 @@
 package util
 
-import twirl.api.Html
 import scala.slick.driver.H2Driver.simple._
+import scala.util.matching.Regex
 
 /**
  * Provides some usable implicit conversions.
@@ -30,4 +30,23 @@ object Implicits {
     def &&(c2: => Column[Boolean], guard: => Boolean): Column[Boolean] = if(guard) c1 && c2 else c1
   }
 
+  implicit class RichString(value: String){
+    def replaceBy(regex: Regex)(replace: Regex.MatchData => Option[String]): String = {
+      val sb = new StringBuilder()
+      var i = 0
+      regex.findAllIn(value).matchData.foreach { m =>
+        sb.append(value.substring(i, m.start))
+        i = m.end
+        replace(m) match {
+          case Some(s) => sb.append(s)
+          case None    => sb.append(m.matched)
+        }
+      }
+      if(i < value.length){
+        sb.append(value.substring(i))
+      }
+      sb.toString
+    }
+  }
+
 }

src/main/scala/util/JGitUtil.scala

@@ -54,7 +54,7 @@ object JGitUtil {
    * @param id the commit id
    * @param time the commit time
    * @param committer  the committer name
-   * @param mailAddress the committer's mail address
+   * @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
@@ -63,9 +63,12 @@ object JGitUtil {
                         shortMessage: String, fullMessage: String, parents: List[String]){
     
     def this(rev: org.eclipse.jgit.revwalk.RevCommit) = this(
-        rev.getName, rev.getCommitterIdent.getWhen,
+        rev.getName,
-        rev.getCommitterIdent.getName, rev.getCommitterIdent.getEmailAddress,
+        rev.getCommitterIdent.getWhen,
-        rev.getShortMessage, rev.getFullMessage,
+        rev.getCommitterIdent.getName,
+        rev.getCommitterIdent.getEmailAddress,
+        rev.getShortMessage,
+        rev.getFullMessage,
         rev.getParents().map(_.name).toList)
 
     val summary = {

src/main/scala/view/AvatarImageProvider.scala

@@ -0,0 +1,31 @@
+package view
+
+import service.RequestCache
+import twirl.api.Html
+import util.StringUtil
+
+trait AvatarImageProvider { self: RequestCache =>
+
+  /**
+   * Returns <img> which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  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}"""
+    } getOrElse {
+      if(mailAddress.nonEmpty){
+        s"""http://www.gravatar.com/avatar/${StringUtil.md5(mailAddress)}?s=${size}"""
+      } else {
+        s"""${context.path}/${userName}/_avatar"""
+      }
+    }
+    if(tooltip){
+      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
+    } else {
+      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" />""")
+    }
+  }
+
+}

src/main/scala/view/LinkConverter.scala

@@ -0,0 +1,33 @@
+package view
+
+import service.RequestCache
+import util.Implicits.RichString
+
+trait LinkConverter { self: RequestCache =>
+
+  /**
+   * Converts issue id, username and commit id to link.
+   */
+  protected def convertRefsLinks(value: String, repository: service.RepositoryService.RepositoryInfo,
+                                 issueIdPrefix: String =  "#")(implicit context: app.Context): String = {
+    value
+      // escape HTML tags
+      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
+      // convert issue id to link
+      .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m =>
+        if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){
+          Some(s"""${m.group(1)}<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(2)}">#${m.group(2)}</a>${m.group(3)}""")
+        } else {
+          Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""")
+        }
+      }
+      // convert @username to link
+      .replaceBy("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)".r){ m =>
+        getAccountByUserName(m.group(2)).map { _ =>
+          s"""${m.group(1)}<a href="${context.path}/${m.group(2)}">@${m.group(2)}</a>${m.group(3)}"""
+        }
+      }
+      // convert commit id to link
+      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
+  }
+}

src/main/scala/view/Markdown.scala

@@ -6,6 +6,7 @@ import org.pegdown._
 import org.pegdown.ast._
 import org.pegdown.LinkRenderer.Rendering
 import scala.collection.JavaConverters._
+import service.RequestCache
 
 object Markdown {
 
@@ -13,12 +14,17 @@ object Markdown {
    * Converts Markdown of Wiki pages to HTML.
    */
   def toHtml(markdown: String, repository: service.RepositoryService.RepositoryInfo,
-             enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): String = {
+             enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): String = {
+    // escape issue id
+    val source = if(enableRefsLink){
+      markdown.replaceAll("(^|\\W)#([0-9]+)(\\W|$)", "$1issue:$2$3")
+    } else markdown
+
     val rootNode = new PegDownProcessor(
       Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES
-    ).parseMarkdown(markdown.toCharArray)
+    ).parseMarkdown(source.toCharArray)
 
-    new GitBucketHtmlSerializer(markdown, context, repository, enableWikiLink, enableCommitLink, enableIssueLink).toHtml(rootNode)
+    new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink).toHtml(rootNode)
   }
 }
 
@@ -64,15 +70,13 @@ class GitBucketVerbatimSerializer extends VerbatimSerializer {
 
 class GitBucketHtmlSerializer(
     markdown: String,
-    context: app.Context,
     repository: service.RepositoryService.RepositoryInfo,
     enableWikiLink: Boolean,
-    enableCommitLink: Boolean,
+    enableRefsLink: Boolean
-    enableIssueLink: Boolean
+  )(implicit val context: app.Context) extends ToHtmlSerializer(
-  ) extends ToHtmlSerializer(
     new GitBucketLinkRender(context, repository, enableWikiLink),
     Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava
-  ) {
+  ) with LinkConverter with RequestCache {
 
   override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
     printer.print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>")
@@ -100,10 +104,7 @@ class GitBucketHtmlSerializer(
 
   override def visit(node: TextNode) {
     // convert commit id and username to link.
-    val text = if(enableCommitLink) node.getText
+    val text = if(enableRefsLink) convertRefsLinks(node.getText, repository, "issue:") else node.getText
-      .replaceAll("(^|\\W)([0-9a-f]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3""")
-      .replaceAll("(^|\\W)@([a-zA-Z0-9\\-_]+)(\\W|$)", s"""$$1<a href="${context.path}/$$2">@$$2</a>$$3""")
-    else node.getText
 
     if (abbreviations.isEmpty) {
       printer.print(text)
@@ -112,15 +113,4 @@ class GitBucketHtmlSerializer(
     }
   }
 
-  override def visit(node: HeaderNode) {
-    val text = markdown.substring(node.getStartIndex, node.getEndIndex - 1).trim
-    if(enableIssueLink && text.matches("#[\\d]+")){
-      // convert issue id to link
-      val issueId = text.substring(1).toInt
-      printer.print(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${issueId}">#${issueId}</a>""")
-    } else {
-      printTag(node, "h" + node.getLevel)
-    }
-  }
-
 }

src/main/scala/view/helpers.scala

@@ -4,11 +4,12 @@ import java.text.SimpleDateFormat
 import twirl.api.Html
 import util.StringUtil
 import service.AccountService
+import service.RequestCache
 
 /**
  * Provides helper methods for Twirl templates.
  */
-object helpers {
+object helpers extends AvatarImageProvider with LinkConverter with RequestCache {
   
   /**
    * Format java.util.Date to "yyyy-MM-dd HH:mm:ss".
@@ -31,10 +32,26 @@ object helpers {
    * Converts Markdown of Wiki pages to HTML.
    */
   def markdown(value: String, repository: service.RepositoryService.RepositoryInfo,
-               enableWikiLink: Boolean, enableCommitLink: Boolean, enableIssueLink: Boolean)(implicit context: app.Context): Html = {
+               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
-    Html(Markdown.toHtml(value, repository, enableWikiLink, enableCommitLink, enableIssueLink))
+    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))
   }
 
+  /**
+   * Returns <img> which displays the avatar icon.
+   * Looks up Gravatar if avatar icon has not been configured in user settings.
+   */
+  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html =
+    getAvatarImageHtml(userName, size, "", tooltip)
+
+  def avatar(commit: util.JGitUtil.CommitInfo, size: Int)(implicit context: app.Context): Html =
+    getAvatarImageHtml(commit.committer, size, commit.mailAddress)
+
+  /**
+   * Converts commit id, issue id and username to the link.
+   */
+  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
+    Html(convertRefsLinks(value, repository))
+
   def activityMessage(message: String)(implicit context: app.Context): Html =
     Html(message
       .replaceAll("\\[issue:([^\\s]+?)/([^\\s]+?)#((\\d+))\\]"   , s"""<a href="${context.path}/$$1/$$2/issues/$$3">$$1/$$2#$$3</a>""")
@@ -66,19 +83,6 @@ object helpers {
   def assets(implicit context: app.Context): String =
     s"${context.path}/assets"
 
-  /**
-   * Converts issue id and commit id to link.
-   */
-  def link(value: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): Html =
-    Html(value
-      // escape HTML tags
-      .replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll("\"", "&quot;")
-      // convert issue id to link
-      .replaceAll("(^|\\W)#(\\d+)(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/issues/$$2">#$$2</a>$$3""")
-      // convert commit id to link
-      .replaceAll("(^|\\W)([a-f0-9]{40})(\\W|$)", s"""$$1<a href="${context.path}/${repository.owner}/${repository.name}/commit/$$2">$$2</a>$$3"""))
-
-
   def user(userName: String, mailAddress: String, styleClass: String = "")(implicit context: app.Context): Html = {
     val account = context.cache(s"account.${mailAddress}"){
       new AccountService {}.getAccountByMailAddress(mailAddress)
@@ -88,30 +92,6 @@ object helpers {
     } getOrElse Html(userName)
   }
 
-  /**
-   * Returns &lt;img&gt; which displays the avatar icon.
-   * Looks up Gravatar if avatar icon has not been configured in user settings.
-   */
-  def avatar(userName: String, size: Int, tooltip: Boolean = false)(implicit context: app.Context): Html = {
-    val account = context.cache(s"account.${userName}"){
-      if(userName.contains("@")){
-        new AccountService {}.getAccountByMailAddress(userName)
-      } else {
-        new AccountService {}.getAccountByUserName(userName)
-      }
-    }
-    val src = account.collect { case account if(account.image.isEmpty) =>
-      s"""http://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress)}?s=${size}"""
-    } getOrElse {
-      s"""${context.path}/${userName}/_avatar"""
-    }
-    if(tooltip){
-      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title=${userName}/>""")
-    } else {
-      Html(s"""<img src=${src} class="avatar" style="width: ${size}px; height: ${size}px;" />""")
-    }
-  }
-
   /**
    * Implicit conversion to add mkHtml() to Seq[Html].
    */

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

@@ -1,5 +1,5 @@
-@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean,
+@(repository: service.RepositoryService.RepositoryInfo, content: String, enableWikiLink: Boolean, enableRefsLink: Boolean,
-  enableCommitLink: Boolean, enableIssueLink: Boolean, style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
+  style: String = "", placeholder: String = "Leave a comment")(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <div class="tabbable">
@@ -30,10 +30,9 @@ $(function(){
   $('#preview').click(function(){
     $('#preview-area').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
     $.post('@url(repository)/_preview', {
-      content          : $('#content').val(),
+      content        : $('#content').val(),
-      enableWikiLink   : @enableWikiLink,
+      enableWikiLink : @enableWikiLink,
-      enableCommitLink : @enableCommitLink,
+      enableRefsLink : @enableRefsLink
-      enableIssueLink  : @enableIssueLink
     }, function(data){
       $('#preview-area').html(data);
       prettyPrint();

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

@@ -43,7 +43,7 @@
             </div>
           </div>
           <hr>
-          @helper.html.preview(repository, "", false, true, true, "width: 600px; height: 200px;")
+          @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px;")
         </div>
       </div>
       <div class="pull-right">

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

@@ -64,11 +64,12 @@
             </div>
           </div>
           <div class="issue-content" id="issueContent">
-            @markdown(issue.content getOrElse "No description given.", repository, false, true, true)
+            @markdown(issue.content getOrElse "No description given.", repository, false, true)
           </div>
         </div>
       </div>
       @comments.map { comment =>
+        @if(comment.action != "close" && comment.action != "reopen"){
         <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
         <div class="box issue-comment-box" id="comment-@comment.commentId">
           <div class="box-header-small">
@@ -76,24 +77,26 @@
             <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> commented
             <span class="pull-right">
               @datetime(comment.registeredDate)
-              @if(hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false)){
+              @if(comment.action != "commit" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
                 <a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil"></i></a>
               }
             </span>
           </div>
           <div class="box-content"class="issue-content" id="commentContent-@comment.commentId">
-            @markdown(comment.content, repository, false, true, true)
+            @markdown(comment.content, repository, false, true)
           </div>
         </div>
-        @comment.action.map { action =>
+        }
+        @if(comment.action == "close" || comment.action == "close_comment"){
         <div class="small issue-comment-action">
-          @if(action == "close"){
+          <span class="label label-important">Closed</span>
-            <span class="label label-important">Closed</span>
+          <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
-            <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
+        </div>
-          } else {
+        }
-            <span class="label label-success">Reopened</span>
+        @if(comment.action == "reopen" || comment.action == "reopen_comment"){
-            <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
+        <div class="small issue-comment-action">
-          }
+          <span class="label label-success">Reopened</span>
+          <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
         </div>
         }
       }
@@ -102,7 +105,7 @@
           <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
           <div class="box issue-comment-box">
             <div class="box-content">
-              @helper.html.preview(repository, "", false, true, true, "width: 680px; height: 100px;")
+              @helper.html.preview(repository, "", false, true, "width: 680px; height: 100px;")
             </div>
           </div>
           <div class="pull-right">
@@ -122,7 +125,9 @@
         <span class="label label-success issue-status">Open</span>
       }
       <div class="small" style="text-align: center;">
-        <strong>@comments.size</strong> @plural(comments.size, "comment")
+        @defining(comments.filter( _.action.contains("comment") ).size){ count =>
+          <strong>@count</strong> @plural(count, "comment")
+        }
       </div>
       <hr/>
       <div style="margin-bottom: 8px;">

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

@@ -227,7 +227,7 @@
               }
               <span class="pull-right muted">
                 @issue.assignedUserName.map { userName =>
-                  @avatar(userName, 20, true)
+                  @avatar(userName, 20, tooltip = true)
                 }
                 #@issue.issueId
               </span>
@@ -247,6 +247,12 @@
       </div>
     </div>
   </div>
+  @if(hasWritePermission){
+    <form id="batcheditForm" method="POST">
+      <input type="hidden" name="value"/>
+      <input type="hidden" name="checked"/>
+    </form>
+  }
 }
 @if(hasWritePermission){
 <script>
@@ -269,10 +275,11 @@ $(function(){
 
   var submitBatchEdit = function(action, value) {
     var checked = $('.table-issues input[type=checkbox]').filter(':checked').map(function(){ return this.value; }).get().join();
-    $('<form>').attr({action : action, method : 'POST'})
+    var form = $('#batcheditForm');
-        .append($('<input type="hidden">').attr('name', 'value').val(value))
+    form.find('input[name=value]').val(value);
-        .append($('<input type="hidden">').attr('name', 'checked').val(checked))
+    form.find('input[name=checked]').val(checked);
-        .submit();
+    form.attr('action', action);
+    form.submit();
   };
 
   $('#state').click(function(){

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

@@ -81,7 +81,7 @@
               </div>
               @if(milestone.description.isDefined){
                 <div class="milestone-description">
-                  @markdown(milestone.description.get, repository, false, false, false)
+                  @markdown(milestone.description.get, repository, false, false)
                 </div>
               }
             </td>

src/main/twirl/main.scala.html

@@ -26,6 +26,7 @@
     <script src="@assets/datepicker/js/bootstrap-datepicker.js"></script>
     <script src="@assets/colorpicker/js/bootstrap-colorpicker.js"></script>
     <script src="@assets/google-code-prettify/prettify.js"></script>
+    <script src="@assets/zclip/ZeroClipboard.min.js"></script>
   </head>
   <body>
     <div class="navbar">

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

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

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

@@ -43,7 +43,7 @@
     </tr>
     <tr>
       <td>
-        @avatar(commit.mailAddress, 20)
+        @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;">

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

@@ -38,18 +38,20 @@
             <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
           </div>
           <div>
-            <div class="commit-avatar-image">@avatar(commit.mailAddress, 40)</div>
+            <div class="commit-avatar-image">@avatar(commit, 40)</div>
-            <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
+            <div class="commit-message-box">
-            @if(commit.description.isDefined){
+              <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
-              <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+              @if(commit.description.isDefined){
-            }
+                <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
-            <br>
+              }
-            @if(commit.description.isDefined){
+              <br>
-              <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+              @if(commit.description.isDefined){
-            }
+                <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")
+              <div class="small">
-              <span class="muted">@datetime(commit.time)</span>
+                @user(commit.committer, commit.mailAddress, "username")
+                <span class="muted">@datetime(commit.time)</span>
+              </div>
             </div>
           </div>
         </td>

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

@@ -27,8 +27,6 @@
           <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
           @if(latestCommit.description.isDefined){
             <a href="javascript:void(0)" onclick="$('#description-@latestCommit.id').toggle();" class="omit">...</a>
-          }
-          @if(latestCommit.description.isDefined){
             <pre id="description-@latestCommit.id" class="commit-description" style="display: none;">@link(latestCommit.description.get, repository)</pre>
           }
         </th>
@@ -36,7 +34,7 @@
       <tr>
         <td colspan="4" class="latest-commit">
           <div>
-            @avatar(latestCommit.mailAddress, 20)
+            @avatar(latestCommit, 20)
             @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
             <span class="muted">@datetime(latestCommit.time)</span>
             <div class="pull-right align-right monospace">
@@ -82,7 +80,7 @@
   @readme.map { content =>
   <div class="box">
     <div class="box-header">README.md</div>
-    <div class="box-content">@markdown(content, repository, false, false, false)</div>
+    <div class="box-content">@markdown(content, repository, false, false)</div>
   </div>
   }
 }

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

@@ -30,9 +30,9 @@
   <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 class="pull-right">
-    <div class="input-prepend">
+    <div class="input-append">
-      <span class="add-on">HTTP</span>
       <input type="text" value="@repository.url" id="repository-url" readonly>
+      <span id="repository-url-copy" class="add-on btn" data-clipboard-text="@repository.url" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
     </div>
   </li>
 </ul>

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

@@ -23,7 +23,7 @@
   <form action="@url(repository)/wiki/@if(pageName == ""){_new} else {_edit}" method="POST" validate="true">
     <span id="error-pageName" class="error"></span>
     <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
-    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, "width: 900px; height: 400px;", "")
+    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 900px; height: 400px;", "")
     <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
     <input type="hidden" name="currentPageName" value="@pageName"/>
     <input type="submit" value="Save" class="btn btn-success">

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

@@ -22,7 +22,7 @@
     </li>
   </ul>
   <div class="markdown-body">
-    @markdown(page.content, repository, true, false, false)
+    @markdown(page.content, repository, true, false)
   </div>
   <div class="small">
     <span class="muted">Last edited by @page.committer at @datetime(page.time)</span>

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

@@ -6,9 +6,9 @@
   <li@if(active == "pages"){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
   <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
   <li class="pull-right">
-    <div class="input-prepend">
+    <div class="input-append">
-      <span class="add-on">HTTP</span>
       <input type="text" value="@repository.url.replaceFirst("\\.git$", ".wiki.git")" readonly id="repository-url">
+      <span id="repository-url-copy" class="add-on btn" data-clipboard-text="@repository.url.replaceFirst("\\.git$", ".wiki.git")" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
     </div>
   </li>
 </ul>

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

@@ -335,6 +335,10 @@ div.commit-avatar-image {
   margin-right: 4px;
 }
 
+div.commit-message-box {
+  margin-left: 42px;
+}
+
 pre.commit-description {
   font-weight: normal;
   border: none;

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

@@ -1,4 +1,5 @@
 $(function(){
+  // disable Ajax cache
   $.ajaxSetup({ cache: false });
 
   $('#repository-url').click(function(){
@@ -8,5 +9,36 @@ $(function(){
   $('img[data-toggle=tooltip]').tooltip();
   $('a[data-toggle=tooltip]').tooltip();
 
+  // copy to clipboard
+  (function() {
+    // Find ZeroClipboard.swf file URI from ZeroClipboard JavaScript file path.
+    // NOTE(tanacasino) I think this way is wrong... but i don't know correct way.
+    var moviePath = (function() {
+      var zclipjs = "ZeroClipboard.min.js";
+      var scripts = document.getElementsByTagName("script");
+      var i = scripts.length;
+      while(i--) {
+        var match = scripts[i].src.match(zclipjs + "$");
+        if(match) {
+          return match.input.substr(0, match.input.length - 6) + 'swf';
+        }
+      }
+    })();
+    var clip = new ZeroClipboard($("#repository-url-copy"), {
+      moviePath: moviePath
+    });
+    var title = $('#repository-url-copy').attr('title');
+    $('#repository-url-copy').removeAttr('title')
+    clip.on('complete', function(client, args) {
+      $(clip.htmlBridge).attr('title', 'copied!').tooltip('fixTitle').tooltip('show');
+      $(clip.htmlBridge).attr('title', title).tooltip('fixTitle');
+    });
+    $(clip.htmlBridge).tooltip({
+      title: title,
+      placement: $('#repository-url-copy').attr('data-placement')
+    });
+  })();
+
+  // syntax highlighting by google-code-prettify
   prettyPrint();
 });